mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 17:37:37 +00:00
Everywhere: Replace "virtual desktop" => "workspace"
This commit is contained in:
parent
8417c0fb1e
commit
d21dc1f451
27 changed files with 103 additions and 103 deletions
|
@ -63,13 +63,13 @@ void WindowManager::reload_config()
|
|||
{
|
||||
m_config = Core::ConfigFile::open("/etc/WindowServer.ini", Core::ConfigFile::AllowWriting::Yes);
|
||||
|
||||
unsigned virtual_desktop_rows = (unsigned)m_config->read_num_entry("VirtualDesktop", "Rows", default_window_stack_rows);
|
||||
unsigned virtual_desktop_columns = (unsigned)m_config->read_num_entry("VirtualDesktop", "Columns", default_window_stack_columns);
|
||||
if (virtual_desktop_rows == 0 || virtual_desktop_columns == 0 || virtual_desktop_rows > max_window_stack_rows || virtual_desktop_columns > max_window_stack_columns) {
|
||||
virtual_desktop_rows = default_window_stack_rows;
|
||||
virtual_desktop_columns = default_window_stack_columns;
|
||||
unsigned workspace_rows = (unsigned)m_config->read_num_entry("Workspace", "Rows", default_window_stack_rows);
|
||||
unsigned workspace_columns = (unsigned)m_config->read_num_entry("Workspace", "Columns", default_window_stack_columns);
|
||||
if (workspace_rows == 0 || workspace_columns == 0 || workspace_rows > max_window_stack_rows || workspace_columns > max_window_stack_columns) {
|
||||
workspace_rows = default_window_stack_rows;
|
||||
workspace_columns = default_window_stack_columns;
|
||||
}
|
||||
apply_virtual_desktop_settings(virtual_desktop_rows, virtual_desktop_columns, false);
|
||||
apply_workspace_settings(workspace_rows, workspace_columns, false);
|
||||
|
||||
m_double_click_speed = m_config->read_num_entry("Input", "DoubleClickSpeed", 250);
|
||||
m_buttons_switched = m_config->read_bool_entry("Mouse", "ButtonsSwitched", false);
|
||||
|
@ -139,7 +139,7 @@ bool WindowManager::save_screen_layout(String& error_msg)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool WindowManager::apply_virtual_desktop_settings(unsigned rows, unsigned columns, bool save)
|
||||
bool WindowManager::apply_workspace_settings(unsigned rows, unsigned columns, bool save)
|
||||
{
|
||||
VERIFY(rows != 0);
|
||||
VERIFY(rows <= max_window_stack_rows);
|
||||
|
@ -230,7 +230,7 @@ bool WindowManager::apply_virtual_desktop_settings(unsigned rows, unsigned colum
|
|||
for (auto* window_moved : windows_moved)
|
||||
WindowManager::the().tell_wms_window_state_changed(*window_moved);
|
||||
|
||||
tell_wms_screen_rects_changed(); // updates the available virtual desktops
|
||||
tell_wms_screen_rects_changed(); // updates the available workspaces
|
||||
if (current_stack_row != new_current_row || current_stack_column != new_current_column)
|
||||
tell_wms_current_window_stack_changed();
|
||||
|
||||
|
@ -239,8 +239,8 @@ bool WindowManager::apply_virtual_desktop_settings(unsigned rows, unsigned colum
|
|||
}
|
||||
|
||||
if (save) {
|
||||
m_config->write_num_entry("VirtualDesktop", "Rows", window_stack_rows());
|
||||
m_config->write_num_entry("VirtualDesktop", "Columns", window_stack_columns());
|
||||
m_config->write_num_entry("Workspace", "Rows", window_stack_rows());
|
||||
m_config->write_num_entry("Workspace", "Columns", window_stack_columns());
|
||||
return m_config->sync();
|
||||
}
|
||||
return true;
|
||||
|
@ -459,10 +459,10 @@ void WindowManager::tell_wm_about_current_window_stack(WMClientConnection& conn)
|
|||
{
|
||||
if (conn.window_id() < 0)
|
||||
return;
|
||||
if (!(conn.event_mask() & WMEventMask::VirtualDesktopChanges))
|
||||
if (!(conn.event_mask() & WMEventMask::WorkspaceChanges))
|
||||
return;
|
||||
auto& window_stack = current_window_stack();
|
||||
conn.async_virtual_desktop_changed(conn.window_id(), window_stack.row(), window_stack.column());
|
||||
conn.async_workspace_changed(conn.window_id(), window_stack.row(), window_stack.column());
|
||||
}
|
||||
|
||||
void WindowManager::tell_wms_window_state_changed(Window& window)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue