1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00

Remove WMFullscreenLevel

Make fullscreen windows be on the same level as normal ones.
This commit is contained in:
Amadeusz Sławiński
2013-11-04 22:07:54 +01:00
committed by Carlos R. Mafra
parent a5ca34ccb1
commit a504370f3b
3 changed files with 6 additions and 11 deletions

View File

@@ -58,7 +58,6 @@ enum {
WMSubmenuLevel = 15, WMSubmenuLevel = 15,
WMMainMenuLevel = 20, WMMainMenuLevel = 20,
WMStatusLevel = 21, WMStatusLevel = 21,
WMFullscreenLevel = 50,
WMModalLevel = 100, WMModalLevel = 100,
WMPopUpLevel = 101, WMPopUpLevel = 101,
WMScreensaverLevel = 1000, WMScreensaverLevel = 1000,

View File

@@ -701,7 +701,7 @@ void wFullscreenWindow(WWindow *wwin)
wWindowConfigureBorders(wwin); wWindowConfigureBorders(wwin);
ChangeStackingLevel(wwin->frame->core, WMFullscreenLevel); ChangeStackingLevel(wwin->frame->core, WMNormalLevel);
wwin->bfs_geometry.x = wwin->frame_x; wwin->bfs_geometry.x = wwin->frame_x;
wwin->bfs_geometry.y = wwin->frame_y; wwin->bfs_geometry.y = wwin->frame_y;
@@ -725,14 +725,10 @@ void wUnfullscreenWindow(WWindow *wwin)
wwin->flags.fullscreen = False; wwin->flags.fullscreen = False;
if (wwin->frame->core->stacking->window_level == WMFullscreenLevel) { if (WFLAGP(wwin, sunken)) {
if (WFLAGP(wwin, sunken)) { ChangeStackingLevel(wwin->frame->core, WMSunkenLevel);
ChangeStackingLevel(wwin->frame->core, WMSunkenLevel); } else if (WFLAGP(wwin, floating)) {
} else if (WFLAGP(wwin, floating)) { ChangeStackingLevel(wwin->frame->core, WMFloatingLevel);
ChangeStackingLevel(wwin->frame->core, WMFloatingLevel);
} else {
ChangeStackingLevel(wwin->frame->core, WMNormalLevel);
}
} }
wWindowConfigure(wwin, wwin->bfs_geometry.x, wwin->bfs_geometry.y, wWindowConfigure(wwin, wwin->bfs_geometry.x, wwin->bfs_geometry.y,

View File

@@ -927,7 +927,7 @@ static int getWindowLayer(WWindow *wwin)
if (wwin->transient_for) { if (wwin->transient_for) {
WWindow *parent = wWindowFor(wwin->transient_for); WWindow *parent = wWindowFor(wwin->transient_for);
if (parent && parent->flags.fullscreen) if (parent && parent->flags.fullscreen)
layer = WMFullscreenLevel; layer = WMNormalLevel;
} }
/* //layer = WMPopUpLevel; // this seems a bad idea -Dan */ /* //layer = WMPopUpLevel; // this seems a bad idea -Dan */
} else if (wwin->type == net_wm_window_type_normal) { } else if (wwin->type == net_wm_window_type_normal) {