summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-02-04 17:45:05 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-02-04 17:45:05 +0000
commitdfcb773476d83b6c070c293a12913ea5d5cd114f (patch)
tree68085dc84d529b30be49c03e5ad5534c9e9d217c
parent3d67b0de18fd541db96f75d76d2ccaf29a7b3f4b (diff)
downloadgdk-pixbuf-dfcb773476d83b6c070c293a12913ea5d5cd114f.tar.gz
Work better when there is not enough space. This avoids a nasty size
2005-02-04 Matthias Clasen <mclasen@redhat.com> * gtk/gtkpaned.c (gtk_paned_compute_position): Work better when there is not enough space. This avoids a nasty size allocation loop in the file chooser. (#154007, reported by Milosz Derezynski, patch by Robert Ögren)
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gtk/gtkpaned.c1
4 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c3bd1daa1..e9e208e3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-02-04 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkpaned.c (gtk_paned_compute_position): Work better
+ when there is not enough space. This avoids a nasty size
+ allocation loop in the file chooser. (#154007, reported
+ by Milosz Derezynski, patch by Robert Ögren)
+
+2005-02-04 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
selection of RTL direction if the widget does not have
focus. (#164125, Frederic Crozat)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c3bd1daa1..e9e208e3d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
2005-02-04 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkpaned.c (gtk_paned_compute_position): Work better
+ when there is not enough space. This avoids a nasty size
+ allocation loop in the file chooser. (#154007, reported
+ by Milosz Derezynski, patch by Robert Ögren)
+
+2005-02-04 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
selection of RTL direction if the widget does not have
focus. (#164125, Frederic Crozat)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c3bd1daa1..e9e208e3d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,12 @@
2005-02-04 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkpaned.c (gtk_paned_compute_position): Work better
+ when there is not enough space. This avoids a nasty size
+ allocation loop in the file chooser. (#154007, reported
+ by Milosz Derezynski, patch by Robert Ögren)
+
+2005-02-04 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
selection of RTL direction if the widget does not have
focus. (#164125, Frederic Crozat)
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index a6a4ef682..7ab84b44d 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1172,6 +1172,7 @@ gtk_paned_compute_position (GtkPaned *paned,
paned->max_position = allocation;
if (!paned->child2_shrink)
paned->max_position = MAX (1, paned->max_position - child2_req);
+ paned->max_position = MAX (paned->min_position, paned->max_position);
if (!paned->position_set)
{