Commit 04c21b2c authored by Kristian Rietveld's avatar Kristian Rietveld Committed by Kristian Rietveld

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

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.
parent a4e8e3de
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>
Fixes #124373, Murray Cumming.
......
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>
Fixes #124373, Murray Cumming.
......
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>
Fixes #124373, Murray Cumming.
......
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>
Fixes #124373, Murray Cumming.
......
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>
Fixes #124373, Murray Cumming.
......
......@@ -166,7 +166,8 @@ static void gtk_combo_box_popdown (GtkComboBox *combo_box)
static gint gtk_combo_box_calc_requested_width (GtkComboBox *combo_box,
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_set_model_internal (GtkComboBox *combo_box);
......@@ -805,7 +806,8 @@ gtk_combo_box_calc_requested_width (GtkComboBox *combo_box,
}
static void
gtk_combo_box_remeasure (GtkComboBox *combo_box)
gtk_combo_box_remeasure (GtkComboBox *combo_box,
gboolean resize)
{
GtkTreeIter iter;
GtkTreePath *path;
......@@ -842,7 +844,7 @@ gtk_combo_box_remeasure (GtkComboBox *combo_box)
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,
combo_box->priv->width, -1);
......@@ -861,6 +863,8 @@ gtk_combo_box_size_request (GtkWidget *widget,
/* common */
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)
{
......@@ -2124,7 +2128,7 @@ gtk_combo_box_cell_layout_add_attribute (GtkCellLayout *layout,
g_list_free (list);
}
gtk_combo_box_remeasure (combo_box);
gtk_combo_box_remeasure (combo_box, TRUE);
}
static void
......@@ -2184,7 +2188,7 @@ gtk_combo_box_cell_layout_set_cell_data_func (GtkCellLayout *layout,
g_list_free (list);
}
gtk_combo_box_remeasure (combo_box);
gtk_combo_box_remeasure (combo_box, TRUE);
}
static void
......@@ -2240,7 +2244,7 @@ gtk_combo_box_cell_layout_clear_attributes (GtkCellLayout *layout,
g_list_free (list);
}
gtk_combo_box_remeasure (combo_box);
gtk_combo_box_remeasure (combo_box, TRUE);
}
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment