Fix to be monotonic in the original size (#308145, Morten Welinder)

2005-07-26  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be
        monotonic in the original size (#308145, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 08ff8fb49417447da5755b9656b4d673cc5b2ccd..8a015cec4c35ee75a8b20c3720dfc621658a3bf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,7 @@
 2005-07-26  Owen Taylor  <otaylor@redhat.com>
 
-       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Use
-       >= not > in deciding whether to subtract out x/ythickness.
-       (#308145, Morten Welinder)
+       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be
+       monotonic in the original size (#308145, Morten Welinder)
 
 2005-07-26  Elijah Newren  <newren@gmail.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 08ff8fb49417447da5755b9656b4d673cc5b2ccd..8a015cec4c35ee75a8b20c3720dfc621658a3bf7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,8 +1,7 @@
 2005-07-26  Owen Taylor  <otaylor@redhat.com>
 
-       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Use
-       >= not > in deciding whether to subtract out x/ythickness.
-       (#308145, Morten Welinder)
+       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be
+       monotonic in the original size (#308145, Morten Welinder)
 
 2005-07-26  Elijah Newren  <newren@gmail.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 08ff8fb49417447da5755b9656b4d673cc5b2ccd..8a015cec4c35ee75a8b20c3720dfc621658a3bf7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,8 +1,7 @@
 2005-07-26  Owen Taylor  <otaylor@redhat.com>
 
-       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Use
-       >= not > in deciding whether to subtract out x/ythickness.
-       (#308145, Morten Welinder)
+       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be
+       monotonic in the original size (#308145, Morten Welinder)
 
 2005-07-26  Elijah Newren  <newren@gmail.com>
 

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index eb18477885bd02546a51f24106de1ccdcdac1085..881d310f5785ba080be217b4c2c44e32598bf995 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3611,14 +3611,12 @@ gtk_notebook_page_allocate (GtkNotebook     *notebook,
        case GTK_POS_TOP:
          page->allocation.y += ythickness;
        case GTK_POS_BOTTOM:
-         if (page->allocation.height >= ythickness)
-           page->allocation.height -= ythickness;
+         page->allocation.height = MAX (1, page->allocation.height - ythickness);
          break;
        case GTK_POS_LEFT:
          page->allocation.x += xthickness;
        case GTK_POS_RIGHT:
-         if (page->allocation.width >= xthickness)
-           page->allocation.width -= xthickness;
+         page->allocation.width = MAX (1, page->allocation.width - xthickness);
          break;
        }
     }