diff options
| author | Matthias Clasen <maclas@gmx.de> | 2004-02-23 01:23:27 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-02-23 01:23:27 +0000 |
| commit | 4a9fac17737c7b3c57c70d2c996ff262bc6a5d8e (patch) | |
| tree | 415851152f76518b6cfcb5cb380cf6adc6ff8e32 | |
| parent | f43b831398596831d60636438df1e0eda190a15c (diff) | |
| download | gdk-pixbuf-4a9fac17737c7b3c57c70d2c996ff262bc6a5d8e.tar.gz | |
Fix the allocation for the toggle button so that it actually shows up in
Mon Feb 23 02:26:15 2004 Matthias Clasen <maclas@gmx.de>
* 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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkcombobox.c | 2 |
6 files changed, 26 insertions, 6 deletions
@@ -1,4 +1,8 @@ -Mon Feb 23 01:56:09 2004 Matthias Clasen <maclas@gmx.de> +Mon Feb 23 02:26:15 2004 Matthias Clasen <maclas@gmx.de> + + * 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 3fde72f9b..553349d30 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,4 +1,8 @@ -Mon Feb 23 01:56:09 2004 Matthias Clasen <maclas@gmx.de> +Mon Feb 23 02:26:15 2004 Matthias Clasen <maclas@gmx.de> + + * 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 3fde72f9b..553349d30 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,4 +1,8 @@ -Mon Feb 23 01:56:09 2004 Matthias Clasen <maclas@gmx.de> +Mon Feb 23 02:26:15 2004 Matthias Clasen <maclas@gmx.de> + + * 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 3fde72f9b..553349d30 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,4 +1,8 @@ -Mon Feb 23 01:56:09 2004 Matthias Clasen <maclas@gmx.de> +Mon Feb 23 02:26:15 2004 Matthias Clasen <maclas@gmx.de> + + * 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 3fde72f9b..553349d30 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,4 +1,8 @@ -Mon Feb 23 01:56:09 2004 Matthias Clasen <maclas@gmx.de> +Mon Feb 23 02:26:15 2004 Matthias Clasen <maclas@gmx.de> + + * 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 4e22b247e..755159c6d 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; |