gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-05-31 01:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

2005-02-12 13:54 Alexander Malmberg <alexander@malmberg.org>

Browse source 
* Source/x11/XGServerWindow.m (setNormalHints): If the window isn't
	resizable, force the min and max sizes to be equal to the current
	size.
	(-placewindow::): Set the hints after updating xframe.

	Fixes bug #11713.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@20693 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2005-02-12 12:50:23 +00:00
parent ad3b3f4712
commit 41d945a4e2
2 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-02-12 13:54 Alexander Malmberg <alexander@malmberg.org>
* Source/x11/XGServerWindow.m (setNormalHints): If the window isn't
resizable, force the min and max sizes to be equal to the current
size.
(-placewindow::): Set the hints after updating xframe.
Fixes bug #11713.
2005-02-10 00:50 Alexander Malmberg <alexander@malmberg.org> 2005-02-10 00:50 Alexander Malmberg <alexander@malmberg.org>
* Tools/gpbs.m (init): Remove the program name from the arguments * Tools/gpbs.m (init): Remove the program name from the arguments

35
Source/x11/XGServerWindow.m
View file

@ -140,7 +140,34 @@ setNormalHints(Display *d, gswindow_device_t *w)
if (w->siz_hints.flags & PResizeInc) if (w->siz_hints.flags & PResizeInc)
NSDebugLLog(@"XGTrace", @"Hint incr %d: %d, %d", NSDebugLLog(@"XGTrace", @"Hint incr %d: %d, %d",
w->number, w->siz_hints.width_inc, w->siz_hints.height_inc); w->number, w->siz_hints.width_inc, w->siz_hints.height_inc);
XSetWMNormalHints(d, w->ident, &w->siz_hints); if (handlesWindowDecorations
&& !(w->win_attrs.window_style & NSResizableWindowMask))
{
/* Some silly window managers (*cough* metacity *cough*) ignore
our "non-resizable" hints unless we set the min and max
sizes equal to the current size, hence the ugly code here. */
CARD32 oldFlags;
int old_w0, old_h0, old_w1, old_h1;
old_w0 = w->siz_hints.min_width;
old_h0 = w->siz_hints.max_width;
old_w1 = w->siz_hints.min_height;
old_h1 = w->siz_hints.max_height;
oldFlags = w->siz_hints.flags;
w->siz_hints.flags |= PMinSize | PMaxSize;
w->siz_hints.min_width = w->siz_hints.max_width = w->xframe.size.width;
w->siz_hints.min_height = w->siz_hints.max_height = w->xframe.size.height;
XSetWMNormalHints(d, w->ident, &w->siz_hints);
w->siz_hints.min_width = old_w0;
w->siz_hints.max_width = old_h0;
w->siz_hints.min_height = old_w1;
w->siz_hints.max_height = old_h1;
w->siz_hints.flags = oldFlags;
}
else
XSetWMNormalHints(d, w->ident, &w->siz_hints);
} }
/* /*
@ -1852,7 +1879,6 @@ static BOOL didCreatePixmaps;
XMoveResizeWindow (dpy, window->ident, XMoveResizeWindow (dpy, window->ident,
window->siz_hints.x, window->siz_hints.y, window->siz_hints.x, window->siz_hints.y,
window->siz_hints.width, window->siz_hints.height); window->siz_hints.width, window->siz_hints.height);
setNormalHints(dpy, window);
/* Update xframe right away. We optimistically assume that we'll get the /* Update xframe right away. We optimistically assume that we'll get the
frame we asked for. If we're right, -gui can update/redraw right away, frame we asked for. If we're right, -gui can update/redraw right away,
@ -1861,6 +1887,11 @@ static BOOL didCreatePixmaps;
at that point, we'll send new GSAppKitWindow* events to -gui. */ at that point, we'll send new GSAppKitWindow* events to -gui. */
window->xframe = xVal; window->xframe = xVal;
/* Update the hints. Note that we do this _after_ updating xframe since
the hint setting code needs the new xframe to work around problems
with min/max sizes and resizability in some window managers. */
setNormalHints(dpy, window);
if (resize == YES) if (resize == YES)
{ {
NSDebugLLog(@"Moving", @"Fake size %d - %@", window->number, NSDebugLLog(@"Moving", @"Fake size %d - %@", window->number,