2003-09-26 21:57:06 +00:00
|
|
|
/* gtkellview.c
|
|
|
|
* Copyright (C) 2002, 2003 Kristian Rietveld <kris@gtk.org>
|
|
|
|
*
|
2003-10-24 18:36:55 +00:00
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
2003-09-26 21:57:06 +00:00
|
|
|
*
|
2003-10-24 18:36:55 +00:00
|
|
|
* This library is distributed in the hope that it will be useful,
|
2003-09-26 21:57:06 +00:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2003-10-24 18:36:55 +00:00
|
|
|
* Library General Public License for more details.
|
2003-09-26 21:57:06 +00:00
|
|
|
*
|
2003-10-24 18:36:55 +00:00
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
2003-09-26 21:57:06 +00:00
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
2003-10-23 18:25:53 +00:00
|
|
|
#include "gtkcellview.h"
|
|
|
|
#include "gtkcelllayout.h"
|
|
|
|
#include "gtkintl.h"
|
|
|
|
#include "gtksignal.h"
|
|
|
|
#include "gtkcellrenderertext.h"
|
|
|
|
#include "gtkcellrendererpixbuf.h"
|
2003-09-26 21:57:06 +00:00
|
|
|
#include <gobject/gmarshal.h>
|
|
|
|
|
|
|
|
typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo;
|
|
|
|
struct _GtkCellViewCellInfo
|
|
|
|
{
|
|
|
|
GtkCellRenderer *cell;
|
|
|
|
|
|
|
|
gint requested_width;
|
|
|
|
gint real_width;
|
|
|
|
guint expand : 1;
|
|
|
|
guint pack : 1;
|
|
|
|
|
|
|
|
GSList *attributes;
|
2003-10-01 20:51:54 +00:00
|
|
|
|
|
|
|
GtkCellLayoutDataFunc func;
|
|
|
|
gpointer func_data;
|
|
|
|
GDestroyNotify destroy;
|
2003-09-26 21:57:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct _GtkCellViewPrivate
|
|
|
|
{
|
|
|
|
GtkTreeModel *model;
|
|
|
|
GtkTreeRowReference *displayed_row;
|
|
|
|
GList *cell_list;
|
|
|
|
gint spacing;
|
|
|
|
|
|
|
|
GdkColor background;
|
|
|
|
gboolean background_set;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static void gtk_cell_view_class_init (GtkCellViewClass *klass);
|
2003-10-01 20:51:54 +00:00
|
|
|
static void gtk_cell_view_cell_layout_init (GtkCellLayoutIface *iface);
|
2003-09-26 21:57:06 +00:00
|
|
|
static void gtk_cell_view_get_property (GObject *object,
|
|
|
|
guint param_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static void gtk_cell_view_set_property (GObject *object,
|
|
|
|
guint param_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static void gtk_cell_view_init (GtkCellView *cellview);
|
|
|
|
static void gtk_cell_view_finalize (GObject *object);
|
|
|
|
static void gtk_cell_view_style_set (GtkWidget *widget,
|
|
|
|
GtkStyle *previous_style);
|
|
|
|
static void gtk_cell_view_size_request (GtkWidget *widget,
|
|
|
|
GtkRequisition *requisition);
|
|
|
|
static void gtk_cell_view_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation);
|
|
|
|
static gboolean gtk_cell_view_expose (GtkWidget *widget,
|
|
|
|
GdkEventExpose *event);
|
|
|
|
static void gtk_cell_view_set_valuesv (GtkCellView *cellview,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
va_list args);
|
2003-10-01 20:51:54 +00:00
|
|
|
static GtkCellViewCellInfo *gtk_cell_view_get_cell_info (GtkCellView *cellview,
|
|
|
|
GtkCellRenderer *renderer);
|
2003-09-26 21:57:06 +00:00
|
|
|
static void gtk_cell_view_set_cell_data (GtkCellView *cellview);
|
|
|
|
|
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
static void gtk_cell_view_cell_layout_pack_start (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
gboolean expand);
|
|
|
|
static void gtk_cell_view_cell_layout_pack_end (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
gboolean expand);
|
|
|
|
static void gtk_cell_view_cell_layout_add_attribute (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
const gchar *attribute,
|
|
|
|
gint column);
|
|
|
|
static void gtk_cell_view_cell_layout_clear (GtkCellLayout *layout);
|
|
|
|
static void gtk_cell_view_cell_layout_clear_attributes (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *renderer);
|
|
|
|
static void gtk_cell_view_cell_layout_set_cell_data_func (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *cell,
|
|
|
|
GtkCellLayoutDataFunc func,
|
|
|
|
gpointer func_data,
|
|
|
|
GDestroyNotify destroy);
|
2003-12-19 22:47:20 +00:00
|
|
|
static void gtk_cell_view_cell_layout_reorder (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *cell,
|
|
|
|
gint position);
|
2003-10-01 20:51:54 +00:00
|
|
|
|
|
|
|
|
2003-12-08 22:55:03 +00:00
|
|
|
#define GTK_CELL_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CELL_VIEW, GtkCellViewPrivate))
|
|
|
|
|
2003-09-26 21:57:06 +00:00
|
|
|
enum
|
|
|
|
{
|
|
|
|
PROP_0,
|
|
|
|
PROP_BACKGROUND,
|
|
|
|
PROP_BACKGROUND_GDK,
|
|
|
|
PROP_BACKGROUND_SET
|
|
|
|
};
|
|
|
|
|
|
|
|
static GtkObjectClass *parent_class = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
GType
|
|
|
|
gtk_cell_view_get_type (void)
|
|
|
|
{
|
|
|
|
static GType cell_view_type = 0;
|
|
|
|
|
|
|
|
if (!cell_view_type)
|
|
|
|
{
|
|
|
|
static const GTypeInfo cell_view_info =
|
|
|
|
{
|
|
|
|
sizeof (GtkCellViewClass),
|
|
|
|
NULL, /* base_init */
|
|
|
|
NULL, /* base_finalize */
|
|
|
|
(GClassInitFunc) gtk_cell_view_class_init,
|
|
|
|
NULL, /* class_finalize */
|
|
|
|
NULL, /* class_data */
|
|
|
|
sizeof (GtkCellView),
|
|
|
|
0,
|
|
|
|
(GInstanceInitFunc) gtk_cell_view_init
|
|
|
|
};
|
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
static const GInterfaceInfo cell_layout_info =
|
|
|
|
{
|
|
|
|
(GInterfaceInitFunc) gtk_cell_view_cell_layout_init,
|
|
|
|
NULL,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2003-09-26 21:57:06 +00:00
|
|
|
cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCellView",
|
|
|
|
&cell_view_info, 0);
|
2003-10-01 20:51:54 +00:00
|
|
|
|
|
|
|
g_type_add_interface_static (cell_view_type, GTK_TYPE_CELL_LAYOUT,
|
|
|
|
&cell_layout_info);
|
2003-09-26 21:57:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return cell_view_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_view_class_init (GtkCellViewClass *klass)
|
|
|
|
{
|
|
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
|
|
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
|
|
|
|
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
|
|
|
|
gobject_class->get_property = gtk_cell_view_get_property;
|
|
|
|
gobject_class->set_property = gtk_cell_view_set_property;
|
|
|
|
gobject_class->finalize = gtk_cell_view_finalize;
|
|
|
|
|
|
|
|
widget_class->expose_event = gtk_cell_view_expose;
|
|
|
|
widget_class->size_allocate = gtk_cell_view_size_allocate;
|
|
|
|
widget_class->size_request = gtk_cell_view_size_request;
|
|
|
|
widget_class->style_set = gtk_cell_view_style_set;
|
|
|
|
|
|
|
|
/* properties */
|
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_BACKGROUND,
|
|
|
|
g_param_spec_string ("background",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Background color name"),
|
|
|
|
P_("Background color as a string"),
|
2003-09-26 21:57:06 +00:00
|
|
|
NULL,
|
|
|
|
G_PARAM_WRITABLE));
|
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_BACKGROUND_GDK,
|
|
|
|
g_param_spec_boxed ("background_gdk",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Background color"),
|
|
|
|
P_("Background color as a GdkColor"),
|
2003-09-26 21:57:06 +00:00
|
|
|
GDK_TYPE_COLOR,
|
|
|
|
G_PARAM_READABLE | G_PARAM_WRITABLE));
|
|
|
|
|
|
|
|
#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (gobject_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE))
|
|
|
|
|
|
|
|
ADD_SET_PROP ("background_set", PROP_BACKGROUND_SET,
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Background set"),
|
|
|
|
P_("Whether this tag affects the background color"));
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
g_type_class_add_private (gobject_class, sizeof (GtkCellViewPrivate));
|
|
|
|
}
|
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
static void
|
|
|
|
gtk_cell_view_cell_layout_init (GtkCellLayoutIface *iface)
|
|
|
|
{
|
|
|
|
iface->pack_start = gtk_cell_view_cell_layout_pack_start;
|
|
|
|
iface->pack_end = gtk_cell_view_cell_layout_pack_end;
|
|
|
|
iface->clear = gtk_cell_view_cell_layout_clear;
|
|
|
|
iface->add_attribute = gtk_cell_view_cell_layout_add_attribute;
|
|
|
|
iface->set_cell_data_func = gtk_cell_view_cell_layout_set_cell_data_func;
|
|
|
|
iface->clear_attributes = gtk_cell_view_cell_layout_clear_attributes;
|
2003-12-19 22:47:20 +00:00
|
|
|
iface->reorder = gtk_cell_view_cell_layout_reorder;
|
2003-10-01 20:51:54 +00:00
|
|
|
}
|
|
|
|
|
2003-09-26 21:57:06 +00:00
|
|
|
static void
|
|
|
|
gtk_cell_view_get_property (GObject *object,
|
|
|
|
guint param_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
GtkCellView *view = GTK_CELL_VIEW (object);
|
|
|
|
|
|
|
|
switch (param_id)
|
|
|
|
{
|
|
|
|
case PROP_BACKGROUND_GDK:
|
|
|
|
{
|
|
|
|
GdkColor color;
|
|
|
|
|
|
|
|
color = view->priv->background;
|
|
|
|
|
|
|
|
g_value_set_boxed (value, &color);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case PROP_BACKGROUND_SET:
|
|
|
|
g_value_set_boolean (value, view->priv->background_set);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_view_set_property (GObject *object,
|
|
|
|
guint param_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
GtkCellView *view = GTK_CELL_VIEW (object);
|
|
|
|
|
|
|
|
switch (param_id)
|
|
|
|
{
|
|
|
|
case PROP_BACKGROUND:
|
|
|
|
{
|
|
|
|
GdkColor 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);
|
|
|
|
else
|
|
|
|
g_warning ("Don't know color `%s'", g_value_get_string (value));
|
|
|
|
|
|
|
|
g_object_notify (object, "background_gdk");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case PROP_BACKGROUND_GDK:
|
|
|
|
gtk_cell_view_set_background_color (view, g_value_get_boxed (value));
|
|
|
|
break;
|
|
|
|
case PROP_BACKGROUND_SET:
|
|
|
|
view->priv->background_set = g_value_get_boolean (value);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_view_init (GtkCellView *cellview)
|
|
|
|
{
|
|
|
|
GTK_WIDGET_SET_FLAGS (cellview, GTK_NO_WINDOW);
|
|
|
|
|
|
|
|
cellview->priv = GTK_CELL_VIEW_GET_PRIVATE (cellview);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_view_style_set (GtkWidget *widget,
|
|
|
|
GtkStyle *previous_style)
|
|
|
|
{
|
|
|
|
if (previous_style && GTK_WIDGET_REALIZED (widget))
|
|
|
|
gdk_window_set_background (widget->window,
|
|
|
|
&widget->style->base[GTK_WIDGET_STATE (widget)]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_view_finalize (GObject *object)
|
|
|
|
{
|
2003-11-16 20:53:07 +00:00
|
|
|
gtk_cell_view_cell_layout_clear (GTK_CELL_LAYOUT (object));
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
if (G_OBJECT_CLASS (parent_class)->finalize)
|
|
|
|
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_view_size_request (GtkWidget *widget,
|
|
|
|
GtkRequisition *requisition)
|
|
|
|
{
|
|
|
|
GList *i;
|
|
|
|
gboolean first_cell = TRUE;
|
|
|
|
GtkCellView *cellview;
|
|
|
|
|
|
|
|
cellview = GTK_CELL_VIEW (widget);
|
|
|
|
|
|
|
|
requisition->width = 0;
|
|
|
|
requisition->height = 0;
|
|
|
|
|
|
|
|
if (cellview->priv->displayed_row)
|
|
|
|
gtk_cell_view_set_cell_data (cellview);
|
|
|
|
|
|
|
|
for (i = cellview->priv->cell_list; i; i = i->next)
|
|
|
|
{
|
|
|
|
gint width, height;
|
|
|
|
GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
|
|
|
|
|
|
|
|
if (!info->cell->visible)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!first_cell)
|
|
|
|
requisition->width += cellview->priv->spacing;
|
|
|
|
|
|
|
|
gtk_cell_renderer_get_size (info->cell, widget, NULL, NULL, NULL,
|
|
|
|
&width, &height);
|
|
|
|
|
|
|
|
info->requested_width = width;
|
|
|
|
requisition->width += width;
|
|
|
|
requisition->height = MAX (requisition->height, height);
|
|
|
|
|
|
|
|
first_cell = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_view_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation)
|
|
|
|
{
|
|
|
|
GList *i;
|
|
|
|
gint expand_cell_count = 0;
|
|
|
|
gint full_requested_width = 0;
|
|
|
|
gint extra_space;
|
|
|
|
GtkCellView *cellview;
|
|
|
|
|
|
|
|
widget->allocation = *allocation;
|
|
|
|
|
|
|
|
cellview = GTK_CELL_VIEW (widget);
|
|
|
|
|
|
|
|
/* checking how much extra space we have */
|
|
|
|
for (i = cellview->priv->cell_list; i; i = i->next)
|
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
|
|
|
|
|
|
|
|
if (!info->cell->visible)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (info->expand)
|
|
|
|
expand_cell_count++;
|
|
|
|
|
|
|
|
full_requested_width += info->requested_width;
|
|
|
|
}
|
|
|
|
|
|
|
|
extra_space = widget->allocation.width - full_requested_width;
|
|
|
|
if (extra_space < 0)
|
|
|
|
extra_space = 0;
|
|
|
|
else if (extra_space > 0 && expand_cell_count > 0)
|
|
|
|
extra_space /= expand_cell_count;
|
|
|
|
|
|
|
|
/* iterate list for PACK_START cells */
|
|
|
|
for (i = cellview->priv->cell_list; i; i = i->next)
|
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
|
|
|
|
|
|
|
|
if (info->pack == GTK_PACK_END)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!info->cell->visible)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
info->real_width = info->requested_width + (info->expand?extra_space:0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* iterate list for PACK_END cells */
|
|
|
|
for (i = cellview->priv->cell_list; i; i = i->next)
|
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
|
|
|
|
|
|
|
|
if (info->pack == GTK_PACK_START)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!info->cell->visible)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
info->real_width = info->requested_width + (info->expand?extra_space:0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
gtk_cell_view_expose (GtkWidget *widget,
|
|
|
|
GdkEventExpose *event)
|
|
|
|
{
|
|
|
|
GList *i;
|
|
|
|
GtkCellView *cellview;
|
|
|
|
GdkRectangle area;
|
2003-12-12 20:08:58 +00:00
|
|
|
gboolean rtl = (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL);
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
cellview = GTK_CELL_VIEW (widget);
|
|
|
|
|
|
|
|
if (! GTK_WIDGET_DRAWABLE (widget))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* "blank" background */
|
|
|
|
if (cellview->priv->background_set)
|
|
|
|
{
|
|
|
|
GdkGC *gc;
|
|
|
|
|
|
|
|
gc = gdk_gc_new (GTK_WIDGET (cellview)->window);
|
|
|
|
gdk_gc_set_rgb_fg_color (gc, &cellview->priv->background);
|
|
|
|
|
|
|
|
gdk_draw_rectangle (GTK_WIDGET (cellview)->window,
|
|
|
|
gc,
|
|
|
|
TRUE,
|
|
|
|
|
|
|
|
/*0, 0,*/
|
|
|
|
widget->allocation.x,
|
|
|
|
widget->allocation.y,
|
|
|
|
|
|
|
|
widget->allocation.width,
|
|
|
|
widget->allocation.height);
|
|
|
|
|
|
|
|
g_object_unref (G_OBJECT (gc));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* set cell data (if applicable) */
|
|
|
|
if (cellview->priv->displayed_row)
|
|
|
|
gtk_cell_view_set_cell_data (cellview);
|
|
|
|
|
|
|
|
/* render cells */
|
|
|
|
area = widget->allocation;
|
|
|
|
|
|
|
|
/* we draw on our very own window, initialize x and y to zero */
|
2003-12-12 20:08:58 +00:00
|
|
|
area.x = widget->allocation.x + (rtl ? widget->allocation.width : 0);
|
2003-09-26 21:57:06 +00:00
|
|
|
area.y = widget->allocation.y;
|
|
|
|
|
|
|
|
/* PACK_START */
|
|
|
|
for (i = cellview->priv->cell_list; i; i = i->next)
|
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
|
|
|
|
|
|
|
|
if (info->pack == GTK_PACK_END)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!info->cell->visible)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
area.width = info->real_width;
|
2003-12-12 20:08:58 +00:00
|
|
|
if (rtl)
|
|
|
|
area.x -= area.width;
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
gtk_cell_renderer_render (info->cell,
|
|
|
|
event->window,
|
|
|
|
widget,
|
|
|
|
/* FIXME! */
|
|
|
|
&area, &area, &event->area, 0);
|
|
|
|
|
2003-12-12 20:08:58 +00:00
|
|
|
if (!rtl)
|
|
|
|
area.x += info->real_width;
|
2003-09-26 21:57:06 +00:00
|
|
|
}
|
|
|
|
|
2003-12-12 20:08:58 +00:00
|
|
|
area.x = rtl ? widget->allocation.x : (widget->allocation.x + widget->allocation.width);
|
|
|
|
|
2003-09-26 21:57:06 +00:00
|
|
|
/* PACK_END */
|
|
|
|
for (i = cellview->priv->cell_list; i; i = i->next)
|
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
|
|
|
|
|
|
|
|
if (info->pack == GTK_PACK_START)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!info->cell->visible)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
area.width = info->real_width;
|
2003-12-12 20:08:58 +00:00
|
|
|
if (!rtl)
|
|
|
|
area.x -= area.width;
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
gtk_cell_renderer_render (info->cell,
|
|
|
|
widget->window,
|
|
|
|
widget,
|
|
|
|
/* FIXME ! */
|
|
|
|
&area, &area, &event->area, 0);
|
2003-12-12 20:08:58 +00:00
|
|
|
if (rtl)
|
|
|
|
area.x += info->real_width;
|
2003-09-26 21:57:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GtkCellViewCellInfo *
|
|
|
|
gtk_cell_view_get_cell_info (GtkCellView *cellview,
|
|
|
|
GtkCellRenderer *renderer)
|
|
|
|
{
|
|
|
|
GList *i;
|
|
|
|
|
|
|
|
for (i = cellview->priv->cell_list; i; i = i->next)
|
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
|
|
|
|
|
|
|
|
if (info->cell == renderer)
|
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
static void
|
|
|
|
gtk_cell_view_set_cell_data (GtkCellView *cellview)
|
|
|
|
{
|
|
|
|
GList *i;
|
|
|
|
GtkTreeIter iter;
|
|
|
|
GtkTreePath *path;
|
|
|
|
|
|
|
|
g_return_if_fail (cellview->priv->displayed_row != NULL);
|
|
|
|
|
|
|
|
path = gtk_tree_row_reference_get_path (cellview->priv->displayed_row);
|
|
|
|
gtk_tree_model_get_iter (cellview->priv->model, &iter, path);
|
|
|
|
gtk_tree_path_free (path);
|
|
|
|
|
|
|
|
for (i = cellview->priv->cell_list; i; i = i->next)
|
|
|
|
{
|
|
|
|
GSList *j;
|
|
|
|
GtkCellViewCellInfo *info = i->data;
|
|
|
|
|
|
|
|
if (info->func)
|
|
|
|
{
|
|
|
|
(* info->func) (GTK_CELL_LAYOUT (cellview),
|
|
|
|
info->cell,
|
|
|
|
cellview->priv->model,
|
|
|
|
&iter,
|
|
|
|
info->func_data);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (j = info->attributes; j && j->next; j = j->next->next)
|
|
|
|
{
|
|
|
|
gchar *property = j->data;
|
|
|
|
gint column = GPOINTER_TO_INT (j->next->data);
|
|
|
|
GValue value = {0, };
|
|
|
|
|
|
|
|
gtk_tree_model_get_value (cellview->priv->model, &iter,
|
|
|
|
column, &value);
|
|
|
|
g_object_set_property (G_OBJECT (info->cell),
|
|
|
|
property, &value);
|
|
|
|
g_value_unset (&value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* GtkCellLayout implementation */
|
|
|
|
static void
|
|
|
|
gtk_cell_view_cell_layout_pack_start (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
gboolean expand)
|
2003-09-26 21:57:06 +00:00
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info;
|
2003-10-01 20:51:54 +00:00
|
|
|
GtkCellView *cellview = GTK_CELL_VIEW (layout);
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
|
|
|
|
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
|
|
|
|
g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer));
|
|
|
|
|
|
|
|
g_object_ref (G_OBJECT (renderer));
|
|
|
|
gtk_object_sink (GTK_OBJECT (renderer));
|
|
|
|
|
|
|
|
info = g_new0 (GtkCellViewCellInfo, 1);
|
|
|
|
info->cell = renderer;
|
|
|
|
info->expand = expand ? TRUE : FALSE;
|
|
|
|
info->pack = GTK_PACK_START;
|
|
|
|
|
|
|
|
cellview->priv->cell_list = g_list_append (cellview->priv->cell_list, info);
|
|
|
|
}
|
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
static void
|
|
|
|
gtk_cell_view_cell_layout_pack_end (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
gboolean expand)
|
2003-09-26 21:57:06 +00:00
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info;
|
2003-10-01 20:51:54 +00:00
|
|
|
GtkCellView *cellview = GTK_CELL_VIEW (layout);
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
|
|
|
|
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
|
|
|
|
g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer));
|
|
|
|
|
|
|
|
g_object_ref (G_OBJECT (renderer));
|
|
|
|
gtk_object_sink (GTK_OBJECT (renderer));
|
|
|
|
|
|
|
|
info = g_new0 (GtkCellViewCellInfo, 1);
|
|
|
|
info->cell = renderer;
|
|
|
|
info->expand = expand ? TRUE : FALSE;
|
|
|
|
info->pack = GTK_PACK_END;
|
|
|
|
|
|
|
|
cellview->priv->cell_list = g_list_append (cellview->priv->cell_list, info);
|
|
|
|
}
|
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
static void
|
|
|
|
gtk_cell_view_cell_layout_add_attribute (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
const gchar *attribute,
|
|
|
|
gint column)
|
2003-09-26 21:57:06 +00:00
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info;
|
2003-10-01 20:51:54 +00:00
|
|
|
GtkCellView *cellview = GTK_CELL_VIEW (layout);
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
|
|
|
|
info = gtk_cell_view_get_cell_info (cellview, renderer);
|
|
|
|
g_return_if_fail (info != NULL);
|
|
|
|
|
|
|
|
info->attributes = g_slist_prepend (info->attributes,
|
|
|
|
GINT_TO_POINTER (column));
|
|
|
|
info->attributes = g_slist_prepend (info->attributes,
|
|
|
|
g_strdup (attribute));
|
|
|
|
}
|
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
static void
|
|
|
|
gtk_cell_view_cell_layout_clear (GtkCellLayout *layout)
|
2003-09-26 21:57:06 +00:00
|
|
|
{
|
|
|
|
GList *i;
|
2003-10-01 20:51:54 +00:00
|
|
|
GtkCellView *cellview = GTK_CELL_VIEW (layout);
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
for (i = cellview->priv->cell_list; i; i = i->next)
|
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
|
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
gtk_cell_view_cell_layout_clear_attributes (layout, info->cell);
|
2003-09-26 21:57:06 +00:00
|
|
|
g_object_unref (G_OBJECT (info->cell));
|
|
|
|
g_free (info);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_list_free (cellview->priv->cell_list);
|
|
|
|
cellview->priv->cell_list = NULL;
|
|
|
|
}
|
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
static void
|
|
|
|
gtk_cell_view_cell_layout_set_cell_data_func (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *cell,
|
|
|
|
GtkCellLayoutDataFunc func,
|
|
|
|
gpointer func_data,
|
|
|
|
GDestroyNotify destroy)
|
2003-09-26 21:57:06 +00:00
|
|
|
{
|
2003-10-01 20:51:54 +00:00
|
|
|
GtkCellView *cellview = GTK_CELL_VIEW (layout);
|
2003-09-26 21:57:06 +00:00
|
|
|
GtkCellViewCellInfo *info;
|
2003-10-01 20:51:54 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
|
|
|
|
|
|
|
|
info = gtk_cell_view_get_cell_info (cellview, cell);
|
|
|
|
g_return_if_fail (info != NULL);
|
|
|
|
|
|
|
|
if (info->destroy)
|
|
|
|
{
|
|
|
|
GDestroyNotify d = info->destroy;
|
|
|
|
|
|
|
|
info->destroy = NULL;
|
|
|
|
d (info->func_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
info->func = func;
|
|
|
|
info->func_data = func_data;
|
|
|
|
info->destroy = destroy;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_cell_view_cell_layout_clear_attributes (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *renderer)
|
|
|
|
{
|
|
|
|
GtkCellViewCellInfo *info;
|
|
|
|
GtkCellView *cellview = GTK_CELL_VIEW (layout);
|
2004-02-09 21:19:35 +00:00
|
|
|
GSList *list;
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
|
|
|
|
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
|
|
|
|
|
|
|
|
info = gtk_cell_view_get_cell_info (cellview, renderer);
|
2003-10-01 20:51:54 +00:00
|
|
|
g_return_if_fail (info != NULL);
|
2003-09-26 21:57:06 +00:00
|
|
|
|
2004-02-09 21:19:35 +00:00
|
|
|
list = info->attributes;
|
|
|
|
while (list && list->next)
|
|
|
|
{
|
|
|
|
g_free (list->data);
|
|
|
|
list = list->next->next;
|
|
|
|
}
|
|
|
|
|
2004-02-06 22:25:01 +00:00
|
|
|
g_slist_free (info->attributes);
|
2003-09-26 21:57:06 +00:00
|
|
|
info->attributes = NULL;
|
|
|
|
}
|
|
|
|
|
2003-12-19 22:47:20 +00:00
|
|
|
static void
|
|
|
|
gtk_cell_view_cell_layout_reorder (GtkCellLayout *layout,
|
|
|
|
GtkCellRenderer *cell,
|
|
|
|
gint position)
|
|
|
|
{
|
|
|
|
GList *link;
|
|
|
|
GtkCellViewCellInfo *info;
|
|
|
|
GtkCellView *cellview = GTK_CELL_VIEW (layout);
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
|
|
|
|
g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
|
|
|
|
|
|
|
|
info = gtk_cell_view_get_cell_info (cellview, cell);
|
|
|
|
|
|
|
|
g_return_if_fail (info != NULL);
|
|
|
|
g_return_if_fail (position >= 0);
|
|
|
|
|
|
|
|
link = g_list_find (cellview->priv->cell_list, info);
|
|
|
|
|
|
|
|
g_return_if_fail (link != NULL);
|
|
|
|
|
|
|
|
cellview->priv->cell_list = g_list_remove_link (cellview->priv->cell_list,
|
|
|
|
link);
|
|
|
|
cellview->priv->cell_list = g_list_insert (cellview->priv->cell_list,
|
|
|
|
info, position);
|
|
|
|
|
|
|
|
gtk_widget_queue_draw (GTK_WIDGET (cellview));
|
|
|
|
}
|
2003-10-01 20:51:54 +00:00
|
|
|
|
|
|
|
/* public API */
|
|
|
|
GtkWidget *
|
|
|
|
gtk_cell_view_new (void)
|
2003-09-26 21:57:06 +00:00
|
|
|
{
|
2003-10-01 20:51:54 +00:00
|
|
|
GtkCellView *cellview;
|
2003-09-26 21:57:06 +00:00
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
cellview = GTK_CELL_VIEW (g_object_new (gtk_cell_view_get_type (), NULL));
|
2003-09-26 21:57:06 +00:00
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
return GTK_WIDGET (cellview);
|
|
|
|
}
|
2003-09-26 21:57:06 +00:00
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
GtkWidget *
|
|
|
|
gtk_cell_view_new_with_text (const gchar *text)
|
|
|
|
{
|
|
|
|
GtkCellView *cellview;
|
|
|
|
GtkCellRenderer *renderer;
|
|
|
|
GValue value = {0, };
|
|
|
|
|
|
|
|
cellview = GTK_CELL_VIEW (gtk_cell_view_new ());
|
|
|
|
|
|
|
|
renderer = gtk_cell_renderer_text_new ();
|
|
|
|
gtk_cell_view_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview),
|
|
|
|
renderer, TRUE);
|
|
|
|
|
|
|
|
g_value_init (&value, G_TYPE_STRING);
|
|
|
|
g_value_set_string (&value, text);
|
|
|
|
gtk_cell_view_set_values (cellview, renderer, "text", &value, NULL);
|
|
|
|
g_value_unset (&value);
|
|
|
|
|
|
|
|
return GTK_WIDGET (cellview);
|
2003-09-26 21:57:06 +00:00
|
|
|
}
|
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
GtkWidget *
|
|
|
|
gtk_cell_view_new_with_markup (const gchar *markup)
|
2003-09-26 21:57:06 +00:00
|
|
|
{
|
2003-10-01 20:51:54 +00:00
|
|
|
GtkCellView *cellview;
|
|
|
|
GtkCellRenderer *renderer;
|
|
|
|
GValue value = {0, };
|
2003-09-26 21:57:06 +00:00
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
cellview = GTK_CELL_VIEW (gtk_cell_view_new ());
|
2003-09-26 21:57:06 +00:00
|
|
|
|
2003-10-01 20:51:54 +00:00
|
|
|
renderer = gtk_cell_renderer_text_new ();
|
|
|
|
gtk_cell_view_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview),
|
|
|
|
renderer, TRUE);
|
|
|
|
|
|
|
|
g_value_init (&value, G_TYPE_STRING);
|
|
|
|
g_value_set_string (&value, markup);
|
|
|
|
gtk_cell_view_set_values (cellview, renderer, "markup", &value, NULL);
|
|
|
|
g_value_unset (&value);
|
|
|
|
|
|
|
|
return GTK_WIDGET (cellview);
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkWidget *
|
|
|
|
gtk_cell_view_new_with_pixbuf (GdkPixbuf *pixbuf)
|
|
|
|
{
|
|
|
|
GtkCellView *cellview;
|
|
|
|
GtkCellRenderer *renderer;
|
|
|
|
GValue value = {0, };
|
|
|
|
|
|
|
|
cellview = GTK_CELL_VIEW (gtk_cell_view_new ());
|
|
|
|
|
|
|
|
renderer = gtk_cell_renderer_pixbuf_new ();
|
|
|
|
gtk_cell_view_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview),
|
|
|
|
renderer, TRUE);
|
|
|
|
|
|
|
|
g_value_init (&value, GDK_TYPE_PIXBUF);
|
|
|
|
g_value_set_object (&value, pixbuf);
|
|
|
|
gtk_cell_view_set_values (cellview, renderer, "pixbuf", &value, NULL);
|
|
|
|
g_value_unset (&value);
|
|
|
|
|
|
|
|
return GTK_WIDGET (cellview);
|
2003-09-26 21:57:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
gtk_cell_view_set_value (GtkCellView *cell_view,
|
2003-09-26 21:57:06 +00:00
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
gchar *property,
|
|
|
|
GValue *value)
|
|
|
|
{
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
|
2003-09-26 21:57:06 +00:00
|
|
|
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
|
|
|
|
|
|
|
|
g_object_set_property (G_OBJECT (renderer), property, value);
|
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
/* force resize and redraw */
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (cell_view));
|
|
|
|
gtk_widget_queue_draw (GTK_WIDGET (cell_view));
|
2003-09-26 21:57:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
gtk_cell_view_set_valuesv (GtkCellView *cell_view,
|
2003-09-26 21:57:06 +00:00
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
va_list args)
|
|
|
|
{
|
|
|
|
gchar *attribute;
|
|
|
|
GValue *value;
|
|
|
|
|
|
|
|
attribute = va_arg (args, gchar *);
|
|
|
|
|
|
|
|
while (attribute)
|
|
|
|
{
|
|
|
|
value = va_arg (args, GValue *);
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
gtk_cell_view_set_value (cell_view, renderer, attribute, value);
|
2003-09-26 21:57:06 +00:00
|
|
|
attribute = va_arg (args, gchar *);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
gtk_cell_view_set_values (GtkCellView *cell_view,
|
2003-09-26 21:57:06 +00:00
|
|
|
GtkCellRenderer *renderer,
|
|
|
|
...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
|
2003-09-26 21:57:06 +00:00
|
|
|
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
g_return_if_fail (gtk_cell_view_get_cell_info (cell_view, renderer));
|
2003-09-26 21:57:06 +00:00
|
|
|
|
|
|
|
va_start (args, renderer);
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
gtk_cell_view_set_valuesv (cell_view, renderer, args);
|
2003-09-26 21:57:06 +00:00
|
|
|
va_end (args);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
gtk_cell_view_set_model (GtkCellView *cell_view,
|
2003-09-26 21:57:06 +00:00
|
|
|
GtkTreeModel *model)
|
|
|
|
{
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
|
2003-09-26 21:57:06 +00:00
|
|
|
g_return_if_fail (GTK_IS_TREE_MODEL (model));
|
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
if (cell_view->priv->model)
|
2003-09-26 21:57:06 +00:00
|
|
|
{
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
if (cell_view->priv->displayed_row)
|
|
|
|
gtk_tree_row_reference_free (cell_view->priv->displayed_row);
|
|
|
|
cell_view->priv->displayed_row = NULL;
|
2003-09-26 21:57:06 +00:00
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
g_object_unref (G_OBJECT (cell_view->priv->model));
|
|
|
|
cell_view->priv->model = NULL;
|
2003-09-26 21:57:06 +00:00
|
|
|
}
|
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
cell_view->priv->model = model;
|
2003-09-26 21:57:06 +00:00
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
if (cell_view->priv->model)
|
|
|
|
g_object_ref (G_OBJECT (cell_view->priv->model));
|
2003-09-26 21:57:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
gtk_cell_view_set_displayed_row (GtkCellView *cell_view,
|
2003-09-26 21:57:06 +00:00
|
|
|
GtkTreePath *path)
|
|
|
|
{
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
|
|
|
|
g_return_if_fail (GTK_IS_TREE_MODEL (cell_view->priv->model));
|
2003-09-26 21:57:06 +00:00
|
|
|
g_return_if_fail (path != NULL);
|
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
if (cell_view->priv->displayed_row)
|
|
|
|
gtk_tree_row_reference_free (cell_view->priv->displayed_row);
|
2003-09-26 21:57:06 +00:00
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
cell_view->priv->displayed_row =
|
|
|
|
gtk_tree_row_reference_new (cell_view->priv->model, path);
|
2003-09-26 21:57:06 +00:00
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
/* force resize and redraw */
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (cell_view));
|
|
|
|
gtk_widget_queue_draw (GTK_WIDGET (cell_view));
|
2003-09-26 21:57:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
GtkTreePath *
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
gtk_cell_view_get_displayed_row (GtkCellView *cell_view)
|
2003-09-26 21:57:06 +00:00
|
|
|
{
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), NULL);
|
2003-09-26 21:57:06 +00:00
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
if (!cell_view->priv->displayed_row)
|
2003-09-26 21:57:06 +00:00
|
|
|
return NULL;
|
|
|
|
|
Fixes based on comments from Owen Taylor, #125264.
Tue Nov 18 19:47:59 2003 Kristian Rietveld <kris@gtk.org>
Fixes based on comments from Owen Taylor, #125264.
* gtk/gtkcellview.[ch] (gtk_cell_view_finalize): remove unused
variable,
(gtk_cell_view_set_value), (gtk_cell_view_set_displayed_model): queue
a resize,
(gtk_cell_view_get_size_of_row): new function,
(gtk_cell_view_set_value), (gtk_cell_view_set_valuesv),
(gtk_cell_view_set_values), (gtk_cell_view_set_model),
(gtk_cell_view_set_displayed_row), (gtk_cell_view_get_displayed_row):
s/cellview/cell_view/ in the function definitions, so they match
with the header file.
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): remove the resize
flag again (:, and use gtk_cell_view_get_size_of_row instead of
the measurer, remove _set_size_request call,
(gtk_combo_box_calc_requested_width): use gtk_cell_view_get_size_of_row
instead of the measurer,
(gtk_combo_box_style_set): queue a resize,
(gtk_combo_box_size_request): update of _remeasure call,
(gtk_combo_box_init), (gtk_combo_box_cell_layout_pack_start),
(gtk_combo_box_cell_layout_pack_end),
(gtk_combo_box_cell_layout_clear),
(gtk_combo_box_set_model): get rid of the measurer,
(gtk_combo_box_cell_layout_add_attribute),
(gtk_combo_box_cell_layout_set_cell_data_func),
(gtk_combo_box_cell_layout_clear_attributes): ditto and queue a
resize instead of calling _remeasure.
2003-11-18 19:02:30 +00:00
|
|
|
return gtk_tree_row_reference_get_path (cell_view->priv->displayed_row);
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
gtk_cell_view_get_size_of_row (GtkCellView *cell_view,
|
|
|
|
GtkTreePath *path,
|
|
|
|
GtkRequisition *requisition)
|
|
|
|
{
|
|
|
|
GtkTreeRowReference *tmp;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), FALSE);
|
|
|
|
g_return_val_if_fail (path != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (requisition != NULL, FALSE);
|
|
|
|
|
|
|
|
tmp = cell_view->priv->displayed_row;
|
|
|
|
cell_view->priv->displayed_row =
|
|
|
|
gtk_tree_row_reference_new (cell_view->priv->model, path);
|
|
|
|
|
|
|
|
gtk_cell_view_size_request (GTK_WIDGET (cell_view), requisition);
|
|
|
|
|
|
|
|
gtk_tree_row_reference_free (cell_view->priv->displayed_row);
|
|
|
|
cell_view->priv->displayed_row = tmp;
|
|
|
|
|
|
|
|
return TRUE;
|
2003-09-26 21:57:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2004-01-26 20:21:09 +00:00
|
|
|
gtk_cell_view_set_background_color (GtkCellView *view,
|
|
|
|
const GdkColor *color)
|
2003-09-26 21:57:06 +00:00
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_CELL_VIEW (view));
|
|
|
|
|
|
|
|
if (color)
|
|
|
|
{
|
|
|
|
if (!view->priv->background_set)
|
|
|
|
{
|
|
|
|
view->priv->background_set = TRUE;
|
|
|
|
g_object_notify (G_OBJECT (view), "background_set");
|
|
|
|
}
|
|
|
|
|
|
|
|
view->priv->background = *color;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (view->priv->background_set)
|
|
|
|
{
|
|
|
|
view->priv->background_set = FALSE;
|
|
|
|
g_object_notify (G_OBJECT (view), "background_set");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|