Always set the max width or height to at least 1, since 0 triggers bugs in

Sun Feb 21 17:14:44 1999  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Always
	 set the max width or height to at least 1, since 0
	 triggers bugs in some window managers. (The window
	"pops out" of the frame in fvwm)

9 files changed, 53 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a975fda4b..cc4178a26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Feb 21 17:14:44 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Always
+	 set the max width or height to at least 1, since 0 
+	 triggers bugs in some window managers. (The window 
+	"pops out" of the frame in fvwm)
+
 Sun Feb 21 16:16:22 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkscrolledwindow.c gdk/gdkfont.c gdk/gdkim.c:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a975fda4b..cc4178a26 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Sun Feb 21 17:14:44 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Always
+	 set the max width or height to at least 1, since 0 
+	 triggers bugs in some window managers. (The window 
+	"pops out" of the frame in fvwm)
+
 Sun Feb 21 16:16:22 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkscrolledwindow.c gdk/gdkfont.c gdk/gdkim.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a975fda4b..cc4178a26 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Feb 21 17:14:44 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Always
+	 set the max width or height to at least 1, since 0 
+	 triggers bugs in some window managers. (The window 
+	"pops out" of the frame in fvwm)
+
 Sun Feb 21 16:16:22 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkscrolledwindow.c gdk/gdkfont.c gdk/gdkim.c:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a975fda4b..cc4178a26 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sun Feb 21 17:14:44 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Always
+	 set the max width or height to at least 1, since 0 
+	 triggers bugs in some window managers. (The window 
+	"pops out" of the frame in fvwm)
+
 Sun Feb 21 16:16:22 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkscrolledwindow.c gdk/gdkfont.c gdk/gdkim.c:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a975fda4b..cc4178a26 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sun Feb 21 17:14:44 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Always
+	 set the max width or height to at least 1, since 0 
+	 triggers bugs in some window managers. (The window 
+	"pops out" of the frame in fvwm)
+
 Sun Feb 21 16:16:22 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkscrolledwindow.c gdk/gdkfont.c gdk/gdkim.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a975fda4b..cc4178a26 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Feb 21 17:14:44 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Always
+	 set the max width or height to at least 1, since 0 
+	 triggers bugs in some window managers. (The window 
+	"pops out" of the frame in fvwm)
+
 Sun Feb 21 16:16:22 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkscrolledwindow.c gdk/gdkfont.c gdk/gdkim.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a975fda4b..cc4178a26 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Feb 21 17:14:44 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Always
+	 set the max width or height to at least 1, since 0 
+	 triggers bugs in some window managers. (The window 
+	"pops out" of the frame in fvwm)
+
 Sun Feb 21 16:16:22 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkscrolledwindow.c gdk/gdkfont.c gdk/gdkim.c:
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 32ced4397..65eaa7797 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1115,8 +1115,8 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
   if (geom_mask & GDK_HINT_MAX_SIZE)
     {
       size_hints.flags |= PMaxSize;
-      size_hints.max_width = geometry->max_width;
-      size_hints.max_height = geometry->max_height;
+      size_hints.max_width = MAX (geometry->max_width, 1);
+      size_hints.max_height = MAX (geometry->max_height, 1);
     }
   
   if (geom_mask & GDK_HINT_BASE_SIZE)
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 32ced4397..65eaa7797 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1115,8 +1115,8 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
   if (geom_mask & GDK_HINT_MAX_SIZE)
     {
       size_hints.flags |= PMaxSize;
-      size_hints.max_width = geometry->max_width;
-      size_hints.max_height = geometry->max_height;
+      size_hints.max_width = MAX (geometry->max_width, 1);
+      size_hints.max_height = MAX (geometry->max_height, 1);
     }
   
   if (geom_mask & GDK_HINT_BASE_SIZE)