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).

diff --git a/ChangeLog b/ChangeLog
index edbe2882d2a66ae927e1e2983c4bf6104477bbd2..1cb07007da305c4ad063349e31ff8df39dffe7d7 100644 (file)
--- 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 edbe2882d2a66ae927e1e2983c4bf6104477bbd2..1cb07007da305c4ad063349e31ff8df39dffe7d7 100644 (file)
--- 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 edbe2882d2a66ae927e1e2983c4bf6104477bbd2..1cb07007da305c4ad063349e31ff8df39dffe7d7 100644 (file)
--- 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 edbe2882d2a66ae927e1e2983c4bf6104477bbd2..1cb07007da305c4ad063349e31ff8df39dffe7d7 100644 (file)
--- 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 edbe2882d2a66ae927e1e2983c4bf6104477bbd2..1cb07007da305c4ad063349e31ff8df39dffe7d7 100644 (file)
--- 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 1c0fbeb848bc336484ff1f119da8c5a686926da1..5527b320100c6c0db2c16bc1b586d73800429e55 100644 (file)
--- 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;