Make fullscreen windows be on the same level as normal ones.
---
src/WindowMaker.h | 1 -
src/actions.c | 14 +++++---------
src/wmspec.c | 2 +-
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index f4fa5b8..543f2e3 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -58,7 +58,6 @@ enum {
WMSubmenuLevel = 15,
WMMainMenuLevel = 20,
WMStatusLevel = 21,
- WMFullscreenLevel = 50,
WMModalLevel = 100,
WMPopUpLevel = 101,
WMScreensaverLevel = 1000,
diff --git a/src/actions.c b/src/actions.c
index 17dc965..36a0ca1 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -701,7 +701,7 @@ void wFullscreenWindow(WWindow *wwin)
wWindowConfigureBorders(wwin);
- ChangeStackingLevel(wwin->frame->core, WMFullscreenLevel);
+ ChangeStackingLevel(wwin->frame->core, WMNormalLevel);
wwin->bfs_geometry.x = wwin->frame_x;
wwin->bfs_geometry.y = wwin->frame_y;
@@ -725,14 +725,10 @@ void wUnfullscreenWindow(WWindow *wwin)
wwin->flags.fullscreen = False;
- if (wwin->frame->core->stacking->window_level == WMFullscreenLevel) {
- if (WFLAGP(wwin, sunken)) {
- ChangeStackingLevel(wwin->frame->core, WMSunkenLevel);
- } else if (WFLAGP(wwin, floating)) {
- ChangeStackingLevel(wwin->frame->core, WMFloatingLevel);
- } else {
- ChangeStackingLevel(wwin->frame->core, WMNormalLevel);
- }
+ if (WFLAGP(wwin, sunken)) {
+ ChangeStackingLevel(wwin->frame->core, WMSunkenLevel);
+ } else if (WFLAGP(wwin, floating)) {
+ ChangeStackingLevel(wwin->frame->core, WMFloatingLevel);
}
wWindowConfigure(wwin, wwin->bfs_geometry.x, wwin->bfs_geometry.y,
diff --git a/src/wmspec.c b/src/wmspec.c
index b4a8cfa..58c7f9f 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -927,7 +927,7 @@ static int getWindowLayer(WWindow *wwin)
if (wwin->transient_for) {
WWindow *parent = wWindowFor(wwin->transient_for);
if (parent && parent->flags.fullscreen)
- layer = WMFullscreenLevel;
+ layer = WMNormalLevel;
}
/* //layer = WMPopUpLevel; // this seems a bad idea -Dan */
} else if (wwin->type == net_wm_window_type_normal) {
--
1.8.4.2
--
To unsubscribe, send mail to [email protected].
