* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkcellrenderertext.h"
#include "gtkcellrendererpixbuf.h"
#include "gtkprivate.h"
-#include "gtksizerequest.h"
+#include "gtkorientableprivate.h"
#include <gobject/gmarshal.h>
#include "gtkbuildable.h"
* @Short_description: A widget displaying a single row of a GtkTreeModel
* @Title: GtkCellView
*
- * A #GtkCellView displays a single row of a #GtkTreeModel, using
- * cell renderers just like #GtkTreeView. #GtkCellView doesn't support
- * some of the more complex features of #GtkTreeView, like cell editing
- * and drag and drop.
+ * A #GtkCellView displays a single row of a #GtkTreeModel using a #GtkCellArea
+ * and #GtkCellAreaContext. A #GtkCellAreaContext can be provided to the
+ * #GtkCellView at construction time in order to keep the cellview in context
+ * of a group of cell views, this ensures that the renderers displayed will
+ * be properly aligned with eachother (like the aligned cells in the menus
+ * of #GtkComboBox).
+ *
+ * #GtkCellView is #GtkOrientable in order to decide in which orientation
+ * the underlying #GtkCellAreaContext should be allocated. Taking the #GtkComboBox
+ * menu as an example, cellviews should be oriented horizontally if the menus are
+ * listed top-to-bottom and thus all share the same width but may have separate
+ * individual heights (left-to-right menus should be allocated vertically since
+ * they all share the same height but may have variable widths).
*/
static GObject *gtk_cell_view_constructor (GType type,
const gchar *tagname,
gpointer *data);
+static GtkSizeRequestMode gtk_cell_view_get_request_mode (GtkWidget *widget);
static void gtk_cell_view_get_preferred_width (GtkWidget *widget,
gint *minimum_size,
gint *natural_size);
GtkCellAreaContext *context;
GdkRGBA background;
- gboolean background_set;
gulong size_changed_id;
gulong row_changed_id;
- guint32 draw_sensitive : 1;
- guint32 fit_model : 1;
+ GtkOrientation orientation;
+
+ guint background_set : 1;
+ guint draw_sensitive : 1;
+ guint fit_model : 1;
};
static GtkBuildableIface *parent_buildable_iface;
enum
{
PROP_0,
+ PROP_ORIENTATION,
PROP_BACKGROUND,
PROP_BACKGROUND_GDK,
PROP_BACKGROUND_RGBA,
G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_LAYOUT,
gtk_cell_view_cell_layout_init)
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
- gtk_cell_view_buildable_init))
+ gtk_cell_view_buildable_init)
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL));
static void
gtk_cell_view_class_init (GtkCellViewClass *klass)
widget_class->draw = gtk_cell_view_draw;
widget_class->size_allocate = gtk_cell_view_size_allocate;
+ widget_class->get_request_mode = gtk_cell_view_get_request_mode;
widget_class->get_preferred_width = gtk_cell_view_get_preferred_width;
widget_class->get_preferred_height = gtk_cell_view_get_preferred_height;
widget_class->get_preferred_width_for_height = gtk_cell_view_get_preferred_width_for_height;
widget_class->get_preferred_height_for_width = gtk_cell_view_get_preferred_height_for_width;
/* properties */
+ g_object_class_override_property (gobject_class, PROP_ORIENTATION, "orientation");
+
g_object_class_install_property (gobject_class,
PROP_BACKGROUND,
g_param_spec_string ("background",
P_("Background color as a string"),
NULL,
GTK_PARAM_WRITABLE));
+
+ /**
+ * GtkCellView:background-gdk:
+ *
+ * The background color as a #GdkColor
+ *
+ * Deprecated: 3.4: Use #GtkCellView:background-rgba instead.
+ */
g_object_class_install_property (gobject_class,
PROP_BACKGROUND_GDK,
g_param_spec_boxed ("background-gdk",
P_("Background color"),
P_("Background color as a GdkColor"),
GDK_TYPE_COLOR,
- GTK_PARAM_READWRITE));
+ GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
/**
- * GtkCellView:background-rgba
+ * GtkCellView:background-rgba:
*
* The background color as a #GdkRGBA
*
GTK_PARAM_READWRITE));
/**
- * GtkCellView:model
+ * GtkCellView:model:
*
* The model for cell view
*
/**
- * GtkCellView:cell-area
+ * GtkCellView:cell-area:
*
* The #GtkCellArea rendering cells
*
+ * If no area is specified when creating the cell view with gtk_cell_view_new_with_context()
+ * a horizontally oriented #GtkCellAreaBox will be used.
+ *
* since 3.0
*/
g_object_class_install_property (gobject_class,
GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
- * GtkCellView:cell-area-context
+ * GtkCellView:cell-area-context:
*
* The #GtkCellAreaContext used to compute the geometry of the cell view.
*
+ * A group of cell views can be assigned the same context in order to
+ * ensure the sizes and cell alignments match across all the views with
+ * the same context.
+ *
+ * #GtkComboBox menus uses this to assign the same context to all cell views
+ * in the menu items for a single menu (each submenu creates its own
+ * context since the size of each submenu does not depend on parent
+ * or sibling menus).
+ *
* since 3.0
*/
g_object_class_install_property (gobject_class,
GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
- * GtkCellView:draw-sensitive
+ * GtkCellView:draw-sensitive:
*
* Whether all cells should be draw as sensitive for this view regardless
* of the actual cell properties (used to make menus with submenus appear
GTK_PARAM_READWRITE));
/**
- * GtkCellView:fit-model
+ * GtkCellView:fit-model:
*
* Whether the view should request enough space to always fit
* the size of every row in the model (used by the combo box to
if (!priv->area)
{
- GtkCellArea *area = gtk_cell_area_box_new ();
-
- priv->area = g_object_ref_sink (area);
+ priv->area = gtk_cell_area_box_new ();
+ g_object_ref_sink (priv->area);
}
if (!priv->context)
priv->context = gtk_cell_area_create_context (priv->area);
- priv->size_changed_id =
+ priv->size_changed_id =
g_signal_connect (priv->context, "notify",
G_CALLBACK (context_size_changed_cb), view);
switch (param_id)
{
+ case PROP_ORIENTATION:
+ g_value_set_enum (value, view->priv->orientation);
+ break;
case PROP_BACKGROUND_GDK:
{
GdkColor color;
GParamSpec *pspec)
{
GtkCellView *view = GTK_CELL_VIEW (object);
+ GtkCellViewPrivate *priv = view->priv;
GtkCellArea *area;
GtkCellAreaContext *context;
switch (param_id)
{
+ case PROP_ORIENTATION:
+ priv->orientation = g_value_get_enum (value);
+ if (priv->context)
+ gtk_cell_area_context_reset (priv->context);
+
+ _gtk_orientable_set_style_classes (GTK_ORIENTABLE (object));
+ break;
case PROP_BACKGROUND:
{
- GdkColor color;
-
+ GdkRGBA color;
+
if (!g_value_get_string (value))
- gtk_cell_view_set_background_color (view, NULL);
- else if (gdk_color_parse (g_value_get_string (value), &color))
- gtk_cell_view_set_background_color (view, &color);
+ gtk_cell_view_set_background_rgba (view, NULL);
+ else if (gdk_rgba_parse (&color, g_value_get_string (value)))
+ gtk_cell_view_set_background_rgba (view, &color);
else
g_warning ("Don't know color `%s'", g_value_get_string (value));
-
- g_object_notify (object, "background-gdk");
+
+ g_object_notify (object, "background-rgba");
+ g_object_notify (object, "background-gdk");
}
break;
case PROP_BACKGROUND_GDK:
- gtk_cell_view_set_background_color (view, g_value_get_boxed (value));
+ {
+ GdkColor *color;
+ GdkRGBA rgba;
+
+ color = g_value_get_boxed (value);
+
+ rgba.red = color->red / 65535.0;
+ rgba.green = color->green / 65535.0;
+ rgba.blue = color->blue / 65535.0;
+ rgba.alpha = 1.0;
+
+ gtk_cell_view_set_background_rgba (view, &rgba);
+ }
break;
case PROP_BACKGROUND_RGBA:
gtk_cell_view_set_background_rgba (view, g_value_get_boxed (value));
case PROP_CELL_AREA:
/* Construct-only, can only be assigned once */
area = g_value_get_object (value);
-
+
if (area)
- view->priv->area = g_object_ref_sink (area);
+ {
+ if (priv->area != NULL)
+ {
+ g_warning ("cell-area has already been set, ignoring construct property");
+ g_object_ref_sink (area);
+ g_object_unref (area);
+ }
+ else
+ priv->area = g_object_ref_sink (area);
+ }
break;
case PROP_CELL_AREA_CONTEXT:
/* Construct-only, can only be assigned once */
context = g_value_get_object (value);
-
+
if (context)
- view->priv->context = g_object_ref (context);
+ {
+ if (priv->context != NULL)
+ {
+ g_warning ("cell-area-context has already been set, ignoring construct property");
+ g_object_ref_sink (context);
+ g_object_unref (context);
+ }
+ else
+ priv->context = g_object_ref (context);
+ }
break;
case PROP_DRAW_SENSITIVE:
priv = cellview->priv;
gtk_widget_set_has_window (GTK_WIDGET (cellview), FALSE);
+
+ priv->orientation = GTK_ORIENTATION_HORIZONTAL;
}
static void
* If the cellview is in "fit model" mode, we assume its not in context and needs to
* allocate every time.
*/
- if ((alloc_width <= 0 && alloc_height <= 0) || priv->fit_model)
- {
- gtk_cell_area_context_allocate_width (priv->context, allocation->width);
- gtk_cell_area_context_allocate_height (priv->context, allocation->height);
- }
+ if (priv->fit_model)
+ gtk_cell_area_context_allocate (priv->context, allocation->width, allocation->height);
+ else if (alloc_width != allocation->width && priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_cell_area_context_allocate (priv->context, allocation->width, -1);
+ else if (alloc_height != allocation->height && priv->orientation == GTK_ORIENTATION_VERTICAL)
+ gtk_cell_area_context_allocate (priv->context, -1, allocation->height);
}
static void
GtkTreeIter iter;
gboolean valid;
+ if (!priv->model)
+ return;
+
valid = gtk_tree_model_iter_children (priv->model, &iter, parent);
while (valid)
{
}
}
+static GtkSizeRequestMode
+gtk_cell_view_get_request_mode (GtkWidget *widget)
+{
+ GtkCellView *cellview = GTK_CELL_VIEW (widget);
+ GtkCellViewPrivate *priv = cellview->priv;
+
+ return gtk_cell_area_get_request_mode (priv->area);
+}
+
static void
gtk_cell_view_get_preferred_width (GtkWidget *widget,
gint *minimum_size,
gtk_cell_area_get_preferred_width (priv->area, priv->context, widget, NULL, NULL);
}
- gtk_cell_area_context_sum_preferred_width (priv->context);
gtk_cell_area_context_get_preferred_width (priv->context, minimum_size, natural_size);
g_signal_handler_unblock (priv->context, priv->size_changed_id);
gtk_cell_area_get_preferred_height (priv->area, priv->context, widget, NULL, NULL);
}
- gtk_cell_area_context_sum_preferred_height (priv->context);
gtk_cell_area_context_get_preferred_height (priv->context, minimum_size, natural_size);
g_signal_handler_unblock (priv->context, priv->size_changed_id);
if (gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_PRELIGHT)
state = GTK_CELL_RENDERER_PRELIT;
- else if (gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_INSENSITIVE)
- state = GTK_CELL_RENDERER_INSENSITIVE;
else
state = 0;
gtk_cell_view_cell_layout_get_area (GtkCellLayout *layout)
{
GtkCellView *cellview = GTK_CELL_VIEW (layout);
+ GtkCellViewPrivate *priv = cellview->priv;
+
+ if (G_UNLIKELY (!priv->area))
+ {
+ priv->area = gtk_cell_area_box_new ();
+ g_object_ref_sink (priv->area);
+ }
- return cellview->priv->area;
+ return priv->area;
}
/* GtkBuildable implementation */
const gchar *tagname,
gpointer *data)
{
- if (strcmp (tagname, "attributes") == 0 || strcmp (tagname, "cell-packing") == 0)
- _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname,
- data);
+ if (_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname,
+ data))
+ return;
else if (parent_buildable_iface->custom_tag_end)
parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
data);
{
/* Resize everything in our context if our row changed */
if (gtk_tree_path_compare (row_path, path) == 0)
- gtk_cell_area_context_flush (view->priv->context);
+ gtk_cell_area_context_reset (view->priv->context);
gtk_tree_path_free (row_path);
}
{
GtkCellView *cellview;
GtkCellRenderer *renderer;
- GValue value = {0, };
+ GValue value = G_VALUE_INIT;
cellview = GTK_CELL_VIEW (gtk_cell_view_new ());
{
GtkCellView *cellview;
GtkCellRenderer *renderer;
- GValue value = {0, };
+ GValue value = G_VALUE_INIT;
cellview = GTK_CELL_VIEW (gtk_cell_view_new ());
{
GtkCellView *cellview;
GtkCellRenderer *renderer;
- GValue value = {0, };
+ GValue value = G_VALUE_INIT;
cellview = GTK_CELL_VIEW (gtk_cell_view_new ());
cell_view->priv->displayed_row = NULL;
g_object_unref (cell_view->priv->model);
- cell_view->priv->model = NULL;
}
cell_view->priv->model = model;
* gtk_cell_view_get_size_of_row:
* @cell_view: a #GtkCellView
* @path: a #GtkTreePath
- * @requisition: return location for the size
+ * @requisition: (out): return location for the size
*
* Sets @requisition to the size needed by @cell_view to display
* the model row pointed to by @path.
*
* Since: 2.6
*
- * Deprecated: 3.0: Use gtk_cell_view_get_desired_width_of_row() and
- * gtk_cell_view_get_desired_height_for_width_of_row() instead.
+ * Deprecated: 3.0: Combo box formerly used this to calculate the
+ * sizes for cellviews, now you can achieve this by either using
+ * the #GtkCellView:fit-model property or by setting the currently
+ * displayed row of the #GtkCellView and using gtk_widget_get_preferred_size().
*/
gboolean
gtk_cell_view_get_size_of_row (GtkCellView *cell_view,
GtkTreePath *path,
GtkRequisition *requisition)
{
+ GtkTreeRowReference *tmp;
GtkRequisition req;
g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), FALSE);
g_return_val_if_fail (path != NULL, FALSE);
- /* Return the minimum height for the minimum width */
- gtk_cell_view_get_desired_width_of_row (cell_view, path, &req.width, NULL);
- gtk_cell_view_get_desired_height_for_width_of_row (cell_view, path, req.width, &req.height, NULL);
-
- if (requisition)
- *requisition = req;
-
- return TRUE;
-}
-
-
-/**
- * gtk_cell_view_get_desired_width_of_row:
- * @cell_view: a #GtkCellView
- * @path: a #GtkTreePath
- * @minimum_size: location to store the minimum size
- * @natural_size: location to store the natural size
- *
- * Sets @minimum_size and @natural_size to the width desired by @cell_view
- * to display the model row pointed to by @path.
- *
- * Since: 3.0
- */
-void
-gtk_cell_view_get_desired_width_of_row (GtkCellView *cell_view,
- GtkTreePath *path,
- gint *minimum_size,
- gint *natural_size)
-{
- GtkTreeRowReference *tmp;
-
- g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
- g_return_if_fail (path != NULL);
- g_return_if_fail (minimum_size != NULL || natural_size != NULL);
-
tmp = cell_view->priv->displayed_row;
cell_view->priv->displayed_row =
gtk_tree_row_reference_new (cell_view->priv->model, path);
- gtk_cell_view_get_preferred_width (GTK_WIDGET (cell_view), minimum_size, natural_size);
+ gtk_widget_get_preferred_width (GTK_WIDGET (cell_view), &req.width, NULL);
+ gtk_widget_get_preferred_height_for_width (GTK_WIDGET (cell_view), req.width, &req.height, NULL);
gtk_tree_row_reference_free (cell_view->priv->displayed_row);
cell_view->priv->displayed_row = tmp;
- /* Restore active size (this will restore the cellrenderer info->width/requested_width's) */
- gtk_cell_view_get_preferred_width (GTK_WIDGET (cell_view), NULL, NULL);
-}
-
-
-/**
- * gtk_cell_view_get_desired_height_for_width_of_row:
- * @cell_view: a #GtkCellView
- * @path: a #GtkTreePath
- * @avail_size: available width
- * @minimum_size: location to store the minimum height
- * @natural_size: location to store the natural height
- *
- * Sets @minimum_size and @natural_size to the height desired by @cell_view
- * if it were allocated a width of @avail_size to display the model row
- * pointed to by @path.
- *
- * Since: 3.0
- */
-void
-gtk_cell_view_get_desired_height_for_width_of_row (GtkCellView *cell_view,
- GtkTreePath *path,
- gint avail_size,
- gint *minimum_size,
- gint *natural_size)
-{
- GtkTreeRowReference *tmp;
-
- g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
- g_return_if_fail (path != NULL);
- g_return_if_fail (minimum_size != NULL || natural_size != NULL);
-
- tmp = cell_view->priv->displayed_row;
- cell_view->priv->displayed_row =
- gtk_tree_row_reference_new (cell_view->priv->model, path);
-
- /* Then get the collective height_for_width based on the cached values */
- gtk_cell_view_get_preferred_height_for_width (GTK_WIDGET (cell_view), avail_size, minimum_size, natural_size);
-
- gtk_tree_row_reference_free (cell_view->priv->displayed_row);
- cell_view->priv->displayed_row = tmp;
+ if (requisition)
+ *requisition = req;
- /* Restore active size (this will restore the cellrenderer info->width/requested_width's) */
- gtk_cell_view_get_preferred_width (GTK_WIDGET (cell_view), NULL, NULL);
+ return TRUE;
}
/**
* Sets the background color of @view.
*
* Since: 2.6
+ *
+ * Deprecated: 3.4: Use gtk_cell_view_set_background_rgba() instead.
*/
void
gtk_cell_view_set_background_color (GtkCellView *cell_view,
gtk_widget_queue_draw (GTK_WIDGET (cell_view));
}
+/**
+ * gtk_cell_view_get_draw_sensitive:
+ * @cell_view: a #GtkCellView
+ *
+ * Gets whether @cell_view is configured to draw all of its
+ * cells in a sensitive state.
+ *
+ * Return value: whether @cell_view draws all of its
+ * cells in a sensitive state
+ *
+ * Since: 3.0
+ */
gboolean
gtk_cell_view_get_draw_sensitive (GtkCellView *cell_view)
{
return priv->draw_sensitive;
}
+/**
+ * gtk_cell_view_set_draw_sensitive:
+ * @cell_view: a #GtkCellView
+ * @draw_sensitive: whether to draw all cells in a sensitive state.
+ *
+ * Sets whether @cell_view should draw all of its
+ * cells in a sensitive state, this is used by #GtkComboBox menus
+ * to ensure that rows with insensitive cells that contain
+ * children appear sensitive in the parent menu item.
+ *
+ * Since: 3.0
+ */
void
gtk_cell_view_set_draw_sensitive (GtkCellView *cell_view,
gboolean draw_sensitive)
}
}
+/**
+ * gtk_cell_view_get_fit_model:
+ * @cell_view: a #GtkCellView
+ *
+ * Gets whether @cell_view is configured to request space
+ * to fit the entire #GtkTreeModel.
+ *
+ * Return value: whether @cell_view requests space to fit
+ * the entire #GtkTreeModel.
+ *
+ * Since: 3.0
+ */
gboolean
gtk_cell_view_get_fit_model (GtkCellView *cell_view)
{
return priv->fit_model;
}
+/**
+ * gtk_cell_view_set_fit_model:
+ * @cell_view: a #GtkCellView
+ * @fit_model: whether @cell_view should request space for the whole model.
+ *
+ * Sets whether @cell_view should request space to fit the entire #GtkTreeModel.
+ *
+ * This is used by #GtkComboBox to ensure that the cell view displayed on
+ * the combo box's button always gets enough space and does not resize
+ * when selection changes.
+ *
+ * Since: 3.0
+ */
void
-gtk_cell_view_set_fit_model (GtkCellView *cell_view,
- gboolean fit_model)
+gtk_cell_view_set_fit_model (GtkCellView *cell_view,
+ gboolean fit_model)
{
GtkCellViewPrivate *priv;
{
priv->fit_model = fit_model;
- gtk_cell_area_context_flush (cell_view->priv->context);
+ gtk_cell_area_context_reset (cell_view->priv->context);
g_object_notify (G_OBJECT (cell_view), "fit-model");
}