gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 21:08:08 +01:00
Code Issues Projects Releases Wiki Activity

Simplify wMaximizeWindow() a little bit

Browse Source 
Let's avoid checking the existence of a border every time
we want to adjust the widths. So we'll always subtract the correction
factor, which is zero in case the window has no border.
This commit is contained in:
Carlos R. Mafra
2009-09-16 21:16:57 +02:00
parent 1a85719971
commit eaca92db50
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/actions.c
View File

@@ -303,10 +303,18 @@ void wMaximizeWindow(WWindow * wwin, int directions)
int new_x, new_y; int new_x, new_y;
unsigned int new_width, new_height, half_scr_width; unsigned int new_width, new_height, half_scr_width;
WArea usableArea, totalArea; WArea usableArea, totalArea;
Bool has_border = 1;
int adj_size;
if (!IS_RESIZABLE(wwin)) if (!IS_RESIZABLE(wwin))
return; return;
if (!HAS_BORDER(wwin))
has_border = 0;
/* the size to adjust the geometry */
adj_size = FRAME_BORDER_WIDTH * 2 * has_border;
/* save old coordinates before we change the current values */ /* save old coordinates before we change the current values */
save_old_geometry(wwin); save_old_geometry(wwin);
@@ -342,19 +350,13 @@ void wMaximizeWindow(WWindow * wwin, int directions)
} }
if (directions & MAX_HORIZONTAL) { if (directions & MAX_HORIZONTAL) {
new_width = usableArea.x2 - usableArea.x1; new_width = usableArea.x2 - usableArea.x1 - adj_size;
if (HAS_BORDER(wwin))
new_width -= FRAME_BORDER_WIDTH * 2;
new_x = usableArea.x1; new_x = usableArea.x1;
} else if (directions & MAX_LEFTHALF) { } else if (directions & MAX_LEFTHALF) {
new_width = half_scr_width; new_width = half_scr_width - adj_size;
if (HAS_BORDER(wwin))
new_width -= FRAME_BORDER_WIDTH * 2;
new_x = usableArea.x1; new_x = usableArea.x1;
} else if (directions & MAX_RIGHTHALF) { } else if (directions & MAX_RIGHTHALF) {
new_width = half_scr_width; new_width = half_scr_width - adj_size;
if (HAS_BORDER(wwin))
new_width -= FRAME_BORDER_WIDTH * 2;
new_x = usableArea.x1 + half_scr_width; new_x = usableArea.x1 + half_scr_width;
} else { } else {
new_x = wwin->frame_x; new_x = wwin->frame_x;
@@ -362,9 +364,7 @@ void wMaximizeWindow(WWindow * wwin, int directions)
} }
if (directions & MAX_VERTICAL) { if (directions & MAX_VERTICAL) {
new_height = usableArea.y2 - usableArea.y1; new_height = usableArea.y2 - usableArea.y1 - adj_size;
if (HAS_BORDER(wwin))
new_height -= FRAME_BORDER_WIDTH * 2;
new_y = usableArea.y1; new_y = usableArea.y1;
if (WFLAGP(wwin, full_maximize)) { if (WFLAGP(wwin, full_maximize)) {
new_y -= wwin->frame->top_width; new_y -= wwin->frame->top_width;