callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temporary size requisition fix. Will fix it for real tonight.

Browse Source 
Mon Nov 17 12:58:32 2003  Kristian Rietveld  <kris@gtk.org>

	Temporary size requisition fix. Will fix it for real tonight.

	* gtk/gtkcombobox.c (gtk_combo_box_remeasure): add a resize flag,
	(gtk_combo_box_size_request): use gtk_combo_box_remeasure to determine
	a good width for the child,
	(gtk_combo_box_cell_layout_add_attribute),
	(gtk_combo_box_set_cell_data_func),
	(gtk_combo_box_cell_layout_clear_attributes): update.
This commit is contained in:
Kristian Rietveld
2003-11-17 12:10:06 +00:00
committed by Kristian Rietveld
parent a4e8e3dee5
commit 04c21b2c9b
6 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Mon Nov 17 12:58:32 2003 Kristian Rietveld <kris@gtk.org>
Temporary size requisition fix. Will fix it for real tonight.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): add a resize flag,
(gtk_combo_box_size_request): use gtk_combo_box_remeasure to determine
a good width for the child,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): update.
Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org> Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org>
Fixes #124373, Murray Cumming. Fixes #124373, Murray Cumming.

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
Mon Nov 17 12:58:32 2003 Kristian Rietveld <kris@gtk.org>
Temporary size requisition fix. Will fix it for real tonight.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): add a resize flag,
(gtk_combo_box_size_request): use gtk_combo_box_remeasure to determine
a good width for the child,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): update.
Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org> Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org>
Fixes #124373, Murray Cumming. Fixes #124373, Murray Cumming.

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
Mon Nov 17 12:58:32 2003 Kristian Rietveld <kris@gtk.org>
Temporary size requisition fix. Will fix it for real tonight.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): add a resize flag,
(gtk_combo_box_size_request): use gtk_combo_box_remeasure to determine
a good width for the child,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): update.
Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org> Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org>
Fixes #124373, Murray Cumming. Fixes #124373, Murray Cumming.

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
Mon Nov 17 12:58:32 2003 Kristian Rietveld <kris@gtk.org>
Temporary size requisition fix. Will fix it for real tonight.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): add a resize flag,
(gtk_combo_box_size_request): use gtk_combo_box_remeasure to determine
a good width for the child,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): update.
Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org> Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org>
Fixes #124373, Murray Cumming. Fixes #124373, Murray Cumming.

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
Mon Nov 17 12:58:32 2003 Kristian Rietveld <kris@gtk.org>
Temporary size requisition fix. Will fix it for real tonight.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): add a resize flag,
(gtk_combo_box_size_request): use gtk_combo_box_remeasure to determine
a good width for the child,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): update.
Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org> Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org>
Fixes #124373, Murray Cumming. Fixes #124373, Murray Cumming.

16
gtk/gtkcombobox.c
View File

@ -166,7 +166,8 @@ static void gtk_combo_box_popdown (GtkComboBox *combo_box)
static gint gtk_combo_box_calc_requested_width (GtkComboBox *combo_box, static gint gtk_combo_box_calc_requested_width (GtkComboBox *combo_box,
GtkTreePath *path); GtkTreePath *path);
static void gtk_combo_box_remeasure (GtkComboBox *combo_box); static void gtk_combo_box_remeasure (GtkComboBox *combo_box,
gboolean resize);
static void gtk_combo_box_unset_model (GtkComboBox *combo_box); static void gtk_combo_box_unset_model (GtkComboBox *combo_box);
static void gtk_combo_box_set_model_internal (GtkComboBox *combo_box); static void gtk_combo_box_set_model_internal (GtkComboBox *combo_box);
@ -805,7 +806,8 @@ gtk_combo_box_calc_requested_width (GtkComboBox *combo_box,
} }
static void static void
gtk_combo_box_remeasure (GtkComboBox *combo_box) gtk_combo_box_remeasure (GtkComboBox *combo_box,
gboolean resize)
{ {
GtkTreeIter iter; GtkTreeIter iter;
GtkTreePath *path; GtkTreePath *path;
@ -842,7 +844,7 @@ gtk_combo_box_remeasure (GtkComboBox *combo_box)
gtk_tree_path_free (path); gtk_tree_path_free (path);
if (combo_box->priv->cell_view) if (combo_box->priv->cell_view && resize)
{ {
gtk_widget_set_size_request (combo_box->priv->cell_view, gtk_widget_set_size_request (combo_box->priv->cell_view,
combo_box->priv->width, -1); combo_box->priv->width, -1);
@ -861,6 +863,8 @@ gtk_combo_box_size_request (GtkWidget *widget,
/* common */ /* common */
gtk_widget_size_request (GTK_BIN (widget)->child, &bin_req); gtk_widget_size_request (GTK_BIN (widget)->child, &bin_req);
gtk_combo_box_remeasure (combo_box, FALSE);
bin_req.width = MAX (bin_req.width, combo_box->priv->width);
if (!combo_box->priv->tree_view) if (!combo_box->priv->tree_view)
{ {
@ -2124,7 +2128,7 @@ gtk_combo_box_cell_layout_add_attribute (GtkCellLayout *layout,
g_list_free (list); g_list_free (list);
} }
gtk_combo_box_remeasure (combo_box); gtk_combo_box_remeasure (combo_box, TRUE);
} }
static void static void
@ -2184,7 +2188,7 @@ gtk_combo_box_cell_layout_set_cell_data_func (GtkCellLayout *layout,
g_list_free (list); g_list_free (list);
} }
gtk_combo_box_remeasure (combo_box); gtk_combo_box_remeasure (combo_box, TRUE);
} }
static void static void
@ -2240,7 +2244,7 @@ gtk_combo_box_cell_layout_clear_attributes (GtkCellLayout *layout,
g_list_free (list); g_list_free (list);
} }
gtk_combo_box_remeasure (combo_box); gtk_combo_box_remeasure (combo_box, TRUE);
} }
/* /*