summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Rietveld <kris@gtk.org>2003-10-11 13:39:35 +0000
committerKristian Rietveld <kristian@src.gnome.org>2003-10-11 13:39:35 +0000
commitd75b1a1a0ad22c000b634e680b5cd4fc7b7f892d (patch)
tree47da9e08d5a9abd2dc2d80234dc71a65a984b495
parentc3841e701988474911da4636c367a2eb2d062a10 (diff)
downloadgtk+-d75b1a1a0ad22c000b634e680b5cd4fc7b7f892d.tar.gz
for the custom child list mode, allocate the height allocation->height to
Sat Oct 11 15:37:19 2003 Kristian Rietveld <kris@gtk.org> * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): for the custom child list mode, allocate the height allocation->height to the button instead of the height requested by the button. (Tiny size allocation screwup noticed by Macro Pesenti Gritti).
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-47
-rw-r--r--ChangeLog.pre-2-67
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gtk/gtkcombobox.c2
6 files changed, 36 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index edbe2882d2..1cb07007da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Oct 11 15:37:19 2003 Kristian Rietveld <kris@gtk.org>
+
+ * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): for the custom
+ child list mode, allocate the height allocation->height to the
+ button instead of the height requested by the button. (Tiny
+ size allocation screwup noticed by Macro Pesenti Gritti).
+
Sat Oct 11 15:23:27 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Marco Pesenti Gritti.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index edbe2882d2..1cb07007da 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sat Oct 11 15:37:19 2003 Kristian Rietveld <kris@gtk.org>
+
+ * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): for the custom
+ child list mode, allocate the height allocation->height to the
+ button instead of the height requested by the button. (Tiny
+ size allocation screwup noticed by Macro Pesenti Gritti).
+
Sat Oct 11 15:23:27 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Marco Pesenti Gritti.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index edbe2882d2..1cb07007da 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sat Oct 11 15:37:19 2003 Kristian Rietveld <kris@gtk.org>
+
+ * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): for the custom
+ child list mode, allocate the height allocation->height to the
+ button instead of the height requested by the button. (Tiny
+ size allocation screwup noticed by Macro Pesenti Gritti).
+
Sat Oct 11 15:23:27 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Marco Pesenti Gritti.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index edbe2882d2..1cb07007da 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sat Oct 11 15:37:19 2003 Kristian Rietveld <kris@gtk.org>
+
+ * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): for the custom
+ child list mode, allocate the height allocation->height to the
+ button instead of the height requested by the button. (Tiny
+ size allocation screwup noticed by Macro Pesenti Gritti).
+
Sat Oct 11 15:23:27 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Marco Pesenti Gritti.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index edbe2882d2..1cb07007da 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sat Oct 11 15:37:19 2003 Kristian Rietveld <kris@gtk.org>
+
+ * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): for the custom
+ child list mode, allocate the height allocation->height to the
+ button instead of the height requested by the button. (Tiny
+ size allocation screwup noticed by Macro Pesenti Gritti).
+
Sat Oct 11 15:23:27 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Marco Pesenti Gritti.
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 1c0fbeb848..5527b32010 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -995,7 +995,7 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
child.x = allocation->x + allocation->width - req.width;
child.y = allocation->y;
child.width = req.width;
- child.height = req.height;
+ child.height = allocation->height;
gtk_widget_size_allocate (combo_box->priv->button, &child);
child.x = allocation->x;