diff options
author | Owen Taylor <otaylor@redhat.com> | 2005-07-26 23:58:01 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2005-07-26 23:58:01 +0000 |
commit | dbadd50ad713b7864845c48fd327f358bad39d4b (patch) | |
tree | bf499ea07806b6f63515891e379367d1d8c4d17e | |
parent | e2d2d159ca7df353ebfbf4145f554bdc62131741 (diff) | |
download | gdk-pixbuf-dbadd50ad713b7864845c48fd327f358bad39d4b.tar.gz |
Use >= not > in deciding whether to subtract out x/ythickness. (#308145,
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)
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
-rw-r--r-- | gtk/gtknotebook.c | 4 |
4 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,9 @@ +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) + 2005-07-26 Elijah Newren <newren@gmail.com> Revert part of patch from #166379; don't have gtk_window_present() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9bebc09b5..08ff8fb49 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +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) + 2005-07-26 Elijah Newren <newren@gmail.com> Revert part of patch from #166379; don't have gtk_window_present() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9bebc09b5..08ff8fb49 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +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) + 2005-07-26 Elijah Newren <newren@gmail.com> Revert part of patch from #166379; don't have gtk_window_present() diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index ffe7f810f..eb1847788 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -3611,13 +3611,13 @@ gtk_notebook_page_allocate (GtkNotebook *notebook, case GTK_POS_TOP: page->allocation.y += ythickness; case GTK_POS_BOTTOM: - if (page->allocation.height > ythickness) + if (page->allocation.height >= ythickness) page->allocation.height -= ythickness; break; case GTK_POS_LEFT: page->allocation.x += xthickness; case GTK_POS_RIGHT: - if (page->allocation.width > xthickness) + if (page->allocation.width >= xthickness) page->allocation.width -= xthickness; break; } |