mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-27 00:42:32 +01:00
Variable current_workspace moved to workspace object in global namespace
The variable current_workspace, that contains the current workspace is moved to the global workspace properties. Now the screen is not needed to know the workspace_count.
This commit is contained in:
committed by
Carlos R. Mafra
parent
e5ae684d02
commit
c610b8d7ce
@@ -244,7 +244,7 @@ static void updateWorkspaceMenu(WMenu * menu)
|
||||
}
|
||||
|
||||
/* workspace shortcut labels */
|
||||
if (i / 10 == scr->current_workspace / 10)
|
||||
if (i / 10 == w_global.workspace.current / 10)
|
||||
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_MOVE_WORKSPACE1 + (i % 10)]);
|
||||
else
|
||||
entry->rtext = NULL;
|
||||
@@ -571,7 +571,7 @@ static void updateMenuForWindow(WMenu * menu, WWindow * wwin)
|
||||
|
||||
for (i = 0; i < scr->workspace_submenu->entry_no; i++) {
|
||||
scr->workspace_submenu->entries[i]->clientdata = wwin;
|
||||
if (i == scr->current_workspace)
|
||||
if (i == w_global.workspace.current)
|
||||
wMenuSetEnabled(scr->workspace_submenu, i, False);
|
||||
else
|
||||
wMenuSetEnabled(scr->workspace_submenu, i, True);
|
||||
|
||||
Reference in New Issue
Block a user