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

Fix technical drawing+opaque resize

Browse Source 
Doug Barton reported that using "Technical drawing-like" for "Size display"
under WPrefs "Miscellaneous Ergonomic Preferences" together with opaque
resize would lead to artifacts left on screen when resizing.

This patch fixes it (and it also fixes some minor coding style issues
in the surroundings).
This commit is contained in:
Rodolfo García Peñas (kix)
2012-03-04 09:20:49 +01:00
committed by Carlos R. Mafra
parent a3c99bddc8
commit fe3cbb0dc4
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/moveres.c
View File

@@ -2016,36 +2016,36 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
/* Draw the resize frame for the first time. */ /* Draw the resize frame for the first time. */
mapGeometryDisplay(wwin, fx, fy, fw, fh); mapGeometryDisplay(wwin, fx, fy, fw, fh);
if (!opaqueResize) {
if (!opaqueResize)
drawTransparentFrame(wwin, fx, fy, fw, fh); drawTransparentFrame(wwin, fx, fy, fw, fh);
};
showGeometry(wwin, fx, fy, fx + fw, fy + fh, res); showGeometry(wwin, fx, fy, fx + fw, fy + fh, res);
started = 1; started = 1;
} }
if (started) { if (started) {
if (wPreferences.size_display == WDIS_FRAME_CENTER) { if (!opaqueResize)
if (!opaqueResize) { drawTransparentFrame(wwin, orig_fx, orig_fy, orig_fw, orig_fh);
drawTransparentFrame(wwin, orig_fx, orig_fy, orig_fw, orig_fh);
}; if (wPreferences.size_display == WDIS_FRAME_CENTER)
moveGeometryDisplayCentered(scr, fx + fw / 2, fy + fh / 2); moveGeometryDisplayCentered(scr, fx + fw / 2, fy + fh / 2);
if (!opaqueResize) {
drawTransparentFrame(wwin, fx, fy, fw, fh); if (!opaqueResize)
}; drawTransparentFrame(wwin, fx, fy, fw, fh);
} else {
if (!opaqueResize) {
drawTransparentFrame(wwin, orig_fx, orig_fy, orig_fw, orig_fh);
drawTransparentFrame(wwin, fx, fy, fw, fh);
};
}
if (fh != orig_fh || fw != orig_fw) { if (fh != orig_fh || fw != orig_fw) {
if (wPreferences.size_display == WDIS_NEW) { if (wPreferences.size_display == WDIS_NEW)
showGeometry(wwin, orig_fx, orig_fy, orig_fx + orig_fw, showGeometry(wwin, orig_fx, orig_fy, orig_fx + orig_fw,
orig_fy + orig_fh, res); orig_fy + orig_fh, res);
}
showGeometry(wwin, fx, fy, fx + fw, fy + fh, res); showGeometry(wwin, fx, fy, fx + fw, fy + fh, res);
} }
if (opaqueResize) { if (opaqueResize) {
/* Fist clean the geometry line */
showGeometry(wwin, fx, fy, fx + fw, fy + fh, res);
/* Now, continue drawing */
XUngrabServer(dpy); XUngrabServer(dpy);
wwin->flags.user_changed_width = 1; wwin->flags.user_changed_width = 1;
moveGeometryDisplayCentered(scr, fx + fw / 2, fy + fh / 2); moveGeometryDisplayCentered(scr, fx + fw / 2, fy + fh / 2);
@@ -2065,9 +2065,9 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
if (started) { if (started) {
showGeometry(wwin, fx, fy, fx + fw, fy + fh, res); showGeometry(wwin, fx, fy, fx + fw, fy + fh, res);
if (!opaqueResize) { if (!opaqueResize)
drawTransparentFrame(wwin, fx, fy, fw, fh); drawTransparentFrame(wwin, fx, fy, fw, fh);
}
XUngrabKeyboard(dpy, CurrentTime); XUngrabKeyboard(dpy, CurrentTime);
WMUnmapWidget(scr->gview); WMUnmapWidget(scr->gview);
XUngrabServer(dpy); XUngrabServer(dpy);
@@ -2092,9 +2092,8 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
} }
} }
if (wPreferences.auto_arrange_icons && wXineramaHeads(scr) > 1 && head != wGetHeadForWindow(wwin)) { if (wPreferences.auto_arrange_icons && wXineramaHeads(scr) > 1 && head != wGetHeadForWindow(wwin))
wArrangeIcons(scr, True); wArrangeIcons(scr, True);
}
} }
#undef LEFT #undef LEFT