mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 12:28:22 +01:00
Array of workspaces moved to the workspace object in the global namespace
The variable workspaces, that contains the list of workspaces is moved to the global workspace properties. Now the screen is not needed to know the workspaces. The function getWindowState() doesn't need the WScreen argument.
This commit is contained in:
committed by
Carlos R. Mafra
parent
c610b8d7ce
commit
f0c5073600
@@ -495,7 +495,7 @@ static void saveSettings(WMButton *button, InspectorPanel *panel)
|
||||
|
||||
i = WMGetPopUpButtonSelectedItem(panel->wsP) - 1;
|
||||
if (i >= 0 && i < w_global.workspace.count) {
|
||||
value = WMCreatePLString(panel->frame->screen_ptr->workspaces[i]->name);
|
||||
value = WMCreatePLString(w_global.workspace.array[i]->name);
|
||||
different |= insertAttribute(dict, winDic, AStartWorkspace, value, flags);
|
||||
WMReleasePropList(value);
|
||||
}
|
||||
@@ -1478,7 +1478,6 @@ static void create_tab_window_advanced(WWindow *wwin, InspectorPanel *panel, int
|
||||
|
||||
static void create_tab_icon_workspace(WWindow *wwin, InspectorPanel *panel, int frame_width)
|
||||
{
|
||||
WScreen *scr = wwin->screen_ptr;
|
||||
int i = 0;
|
||||
|
||||
/* miniwindow/workspace */
|
||||
@@ -1530,7 +1529,7 @@ static void create_tab_icon_workspace(WWindow *wwin, InspectorPanel *panel, int
|
||||
WMAddPopUpButtonItem(panel->wsP, _("Nowhere in particular"));
|
||||
|
||||
for (i = 0; i < w_global.workspace.count; i++)
|
||||
WMAddPopUpButtonItem(panel->wsP, scr->workspaces[i]->name);
|
||||
WMAddPopUpButtonItem(panel->wsP, w_global.workspace.array[i]->name);
|
||||
|
||||
i = wDefaultGetStartWorkspace(wwin->screen_ptr, wwin->wm_instance, wwin->wm_class);
|
||||
if (i >= 0 && i <= w_global.workspace.count)
|
||||
|
||||
Reference in New Issue
Block a user