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.
This commit is contained in:
Matthias Clasen 2004-02-23 01:23:27 +00:00 committed by Matthias Clasen
parent f43b831398
commit 4a9fac1773
6 changed files with 26 additions and 6 deletions

View File

@ -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):

View File

@ -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):

View File

@ -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):

View File

@ -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):

View File

@ -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):

View File

@ -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;