From 4a9fac17737c7b3c57c70d2c996ff262bc6a5d8e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 23 Feb 2004 01:23:27 +0000 Subject: [PATCH] Fix the allocation for the toggle button so that it actually shows up in Mon Feb 23 02:26:15 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the allocation for the toggle button so that it actually shows up in LTR list mode. * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): * gtk/gtkcombobox.c (gtk_combo_box_set_wrap_width): Add notification, and avoid excessive relayouting. --- ChangeLog | 6 +++++- ChangeLog.pre-2-10 | 6 +++++- ChangeLog.pre-2-4 | 6 +++++- ChangeLog.pre-2-6 | 6 +++++- ChangeLog.pre-2-8 | 6 +++++- gtk/gtkcombobox.c | 2 +- 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3fde72f9b8..553349d307 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -Mon Feb 23 01:56:09 2004 Matthias Clasen +Mon Feb 23 02:26:15 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the + allocation for the toggle button so that it actually shows up + in LTR list mode. * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3fde72f9b8..553349d307 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,4 +1,8 @@ -Mon Feb 23 01:56:09 2004 Matthias Clasen +Mon Feb 23 02:26:15 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the + allocation for the toggle button so that it actually shows up + in LTR list mode. * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3fde72f9b8..553349d307 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,4 +1,8 @@ -Mon Feb 23 01:56:09 2004 Matthias Clasen +Mon Feb 23 02:26:15 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the + allocation for the toggle button so that it actually shows up + in LTR list mode. * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3fde72f9b8..553349d307 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,4 +1,8 @@ -Mon Feb 23 01:56:09 2004 Matthias Clasen +Mon Feb 23 02:26:15 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the + allocation for the toggle button so that it actually shows up + in LTR list mode. * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3fde72f9b8..553349d307 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,4 +1,8 @@ -Mon Feb 23 01:56:09 2004 Matthias Clasen +Mon Feb 23 02:26:15 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_size_allocate): Fix the + allocation for the toggle button so that it actually shows up + in LTR list mode. * gtk/gtkcombobox.c (gtk_combo_box_set_column_span_column): * gtk/gtkcombobox.c (gtk_combo_box_set_row_span_column): diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 4e22b247e3..755159c6db 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1096,7 +1096,7 @@ gtk_combo_box_size_allocate (GtkWidget *widget, if (is_rtl) child.x = allocation->x; else - child.x += allocation->x + allocation->width - req.width; + child.x = allocation->x + allocation->width - req.width; child.y = allocation->y; child.width = req.width; child.height = allocation->height;