changeset 2450:ce8038b28f80

[xemacs-hg @ 2004-12-22 10:58:58 by stephent] metacity maximize fix <87is6uppl8.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Wed, 22 Dec 2004 10:59:09 +0000
parents 841c5ab546e1
children ad7796e93975
files src/ChangeLog src/EmacsManager.c
diffstat 2 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Dec 21 22:51:48 2004 +0000
+++ b/src/ChangeLog	Wed Dec 22 10:59:09 2004 +0000
@@ -1,3 +1,7 @@
+2004-12-15  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* EmacsManager.c (EmacsManagerChangeSize): Respect XtGeometryNo.
+
 2004-12-07  Malcolm Purvis  <malcolmp@xemacs.org>
 
 	* Makefile.in.in: Always refer to make as $(MAKE) and use
--- a/src/EmacsManager.c	Tue Dec 21 22:51:48 2004 +0000
+++ b/src/EmacsManager.c	Wed Dec 22 10:59:09 2004 +0000
@@ -243,11 +243,15 @@
 
   /* do nothing if we're already that size */
   if (w->core.width != width || w->core.height != height)
-    if (XtMakeResizeRequest (w, width, height, &w->core.width, &w->core.height)
-	== XtGeometryAlmost)
-      XtMakeResizeRequest (w, w->core.width, w->core.height, NULL, NULL);
-
-  Resize (w);
+    {
+      XtGeometryResult result =
+	XtMakeResizeRequest (w, width, height, &w->core.width, &w->core.height);
+      if (result == XtGeometryNo)
+	return;
+      if (result == XtGeometryAlmost)
+	XtMakeResizeRequest (w, w->core.width, w->core.height, NULL, NULL);
+      Resize (w);
+    }
 }