This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via eae7ef6c596f0a8db8000d4590e367b88ba9dbbb (commit)
via ea7ef65b1911bce189e81c29dc87e73263261cf9 (commit)
from e393c6b61a5b3b7792e85b9092798e7bdd1e184d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/eae7ef6c596f0a8db8000d4590e367b88ba9dbbb
commit eae7ef6c596f0a8db8000d4590e367b88ba9dbbb
Author: Amadeusz SÅawiÅski <[email protected]>
Date: Fri Nov 23 20:16:59 2012 +0100
Fix Maximize/Unmaximize in window menu
Add variable to track window startup size and use it when checking for
changes
diff --git a/src/moveres.c b/src/moveres.c
index 59dd0d2..44ddefa 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -1211,6 +1211,8 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
int vert_border = wwin->frame->top_width + wwin->frame->bottom_width;
int src_x = wwin->frame_x;
int src_y = wwin->frame_y;
+ int original_w = w;
+ int original_h = h;
int done, off_x, off_y, ww, wh;
int kspeed = _KS;
int opaqueMoveResize = wPreferences.opaque_move_resize_keyboard;
@@ -1517,10 +1519,10 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
}
}
} else {
- if (wwin->client.width != ww)
+ if (ww != original_w)
wwin->flags.maximized &=
~(MAX_HORIZONTAL | MAX_MAXIMUS);
- if (wwin->client.height != wh -
vert_border)
+ if (wh != original_h)
wwin->flags.maximized &=
~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
wWindowConfigure(wwin, src_x + off_x,
src_y + off_y, ww, wh - vert_border);
@@ -1877,6 +1879,8 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
int orig_fy = fy;
int orig_fw = fw;
int orig_fh = fh;
+ int original_fw = fw;
+ int original_fh = fh;
int head = ((wPreferences.auto_arrange_icons && wXineramaHeads(scr) > 1)
? wGetHeadForWindow(wwin)
: scr->xine_info.primary_head);
@@ -2072,10 +2076,10 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
WMUnmapWidget(scr->gview);
XUngrabServer(dpy);
- if (wwin->client.width != fw)
+ if (fw != original_fw)
wwin->flags.maximized &=
~(MAX_HORIZONTAL | MAX_MAXIMUS);
- if (wwin->client.height != fh - vert_border)
+ if (fh != original_fh)
wwin->flags.maximized &= ~(MAX_VERTICAL
| MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
wWindowConfigure(wwin, fx, fy, fw, fh -
vert_border);
http://repo.or.cz/w/wmaker-crm.git/commit/ea7ef65b1911bce189e81c29dc87e73263261cf9
commit ea7ef65b1911bce189e81c29dc87e73263261cf9
Author: John H. Robinson, IV <[email protected]>
Date: Wed Nov 14 12:15:44 2012 -0800
Makefile: Add forgotten .h files
Please find attached a diff to add the missing .h files from src/Makefile.am
One way to find these:
$ git checkout next
$ ./autogen.sh
$ ./configure
$ make dist-gzip
$ tar xzf WindowMaker-0.95.3.tar.gz
$ cd WindowMaker-0.95.3
$ ./configure
$ make
diff --git a/src/Makefile.am b/src/Makefile.am
index 0521d11..fbedb98 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,6 +22,7 @@ wmaker_SOURCES = client.c client.h
colormap.c + colormap.h cycling.c def_pixmaps.h defaults.c @@
-30,6 +31,7 @@ wmaker_SOURCES = dialog.h dock.c
dockedapp.c + dockedapp.h dock.h event.c
extend_pixmaps.h @@ -42,6 +44,7 @@ wmaker_SOURCES = icon.h
keybind.h main.c + main.h menu.c menu.h
misc.c
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 3 +++
src/moveres.c | 12 ++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
