1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-03-11 12:05:48 +01:00

Fix for unmaximize.

New way for traverse windows introduced an regression for maximize
toggle from keyboard. Bring the maximize toggle back.
This commit is contained in:
2017-01-16 19:50:54 +01:00
parent 54aae6c062
commit 58561dc08a

View File

@@ -492,8 +492,7 @@ void handleMaximize(WWindow *wwin, int directions)
if ((wwin->flags.old_maximized & MAX_MAXIMUS) && if ((wwin->flags.old_maximized & MAX_MAXIMUS) &&
!(requested & MAX_MAXIMUS)) !(requested & MAX_MAXIMUS))
wMaximizeWindow(wwin, MAX_MAXIMUS | flags, head); wMaximizeWindow(wwin, MAX_MAXIMUS | flags, head);
else { else if (requested & MAX_LEFTHALF && current & MAX_LEFTHALF) {
if (requested & MAX_LEFTHALF && current & MAX_LEFTHALF) {
p.x = wwin->frame_x - 100; p.x = wwin->frame_x - 100;
p.y = 0; p.y = 0;
@@ -506,8 +505,7 @@ void handleMaximize(WWindow *wwin, int directions)
wMaximizeWindow(wwin, effective | flags, head); wMaximizeWindow(wwin, effective | flags, head);
} }
} }
} } else if (requested & MAX_RIGHTHALF && current & MAX_RIGHTHALF) {
else if (requested & MAX_RIGHTHALF && current & MAX_RIGHTHALF) {
p.x = wwin->frame_x + wwin->frame->core->width + 100; p.x = wwin->frame_x + wwin->frame->core->width + 100;
p.y = 0; p.y = 0;
head = wGetHeadForPoint(wwin->screen_ptr, p); head = wGetHeadForPoint(wwin->screen_ptr, p);
@@ -517,8 +515,8 @@ void handleMaximize(WWindow *wwin, int directions)
effective &= ~(MAX_HORIZONTAL | MAX_RIGHTHALF); effective &= ~(MAX_HORIZONTAL | MAX_RIGHTHALF);
wMaximizeWindow(wwin, effective | flags, head); wMaximizeWindow(wwin, effective | flags, head);
} }
} } else
} wUnmaximizeWindow(wwin);
/* these alone mean vertical|horizontal toggle */ /* these alone mean vertical|horizontal toggle */
} else if ((effective == MAX_LEFTHALF) || } else if ((effective == MAX_LEFTHALF) ||
(effective == MAX_RIGHTHALF) || (effective == MAX_RIGHTHALF) ||