mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-22 05:48:01 +01:00
Variable clip_icon moved to clip object in the global namespace
The variable clip_icon, that contains the Clip appicon is moved to the global clip properties. Now the screen is not needed to know the clip_icon.
This commit is contained in:
committed by
Carlos R. Mafra
parent
29ac626494
commit
2103fe390b
@@ -620,11 +620,11 @@ void wWorkspaceForceChange(WScreen * scr, int workspace)
|
||||
if (!wPreferences.flags.noclip && (w_global.workspace.array[workspace]->clip->auto_collapse ||
|
||||
w_global.workspace.array[workspace]->clip->auto_raise_lower)) {
|
||||
/* to handle enter notify. This will also */
|
||||
XUnmapWindow(dpy, scr->clip_icon->icon->core->window);
|
||||
XMapWindow(dpy, scr->clip_icon->icon->core->window);
|
||||
XUnmapWindow(dpy, w_global.clip.icon->icon->core->window);
|
||||
XMapWindow(dpy, w_global.clip.icon->icon->core->window);
|
||||
}
|
||||
else if (scr->clip_icon != NULL) {
|
||||
wClipIconPaint(scr->clip_icon);
|
||||
else if (w_global.clip.icon != NULL) {
|
||||
wClipIconPaint(w_global.clip.icon);
|
||||
}
|
||||
wScreenUpdateUsableArea(scr);
|
||||
wNETWMUpdateDesktop(scr);
|
||||
@@ -699,8 +699,8 @@ void wWorkspaceRename(WScreen *scr, int workspace, const char *name)
|
||||
}
|
||||
}
|
||||
|
||||
if (scr->clip_icon)
|
||||
wClipIconPaint(scr->clip_icon);
|
||||
if (w_global.clip.icon)
|
||||
wClipIconPaint(w_global.clip.icon);
|
||||
|
||||
WMPostNotificationName(WMNWorkspaceNameChanged, scr, (void *)(uintptr_t) workspace);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user