* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
+#include "config.h"
#include <stdlib.h>
#include "gtkcellrenderertoggle.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtktreeprivate.h"
-#include "gtkalias.h"
+
static void gtk_cell_renderer_toggle_get_property (GObject *object,
guint param_id,
guint param_id,
const GValue *value,
GParamSpec *pspec);
-static void gtk_cell_renderer_toggle_init (GtkCellRendererToggle *celltext);
-static void gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class);
static void gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
GdkRectangle *cell_area,
gint *width,
gint *height);
static void gtk_cell_renderer_toggle_render (GtkCellRenderer *cell,
- GdkWindow *window,
+ cairo_t *cr,
GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
GtkCellRendererState flags);
static gboolean gtk_cell_renderer_toggle_activate (GtkCellRenderer *cell,
GdkEvent *event,
};
enum {
- PROP_ZERO,
+ PROP_0,
PROP_ACTIVATABLE,
PROP_ACTIVE,
PROP_RADIO,
PROP_INDICATOR_SIZE
};
-#define TOGGLE_WIDTH 12
+#define TOGGLE_WIDTH 13
static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
-#define GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererTogglePrivate))
-
-typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate;
struct _GtkCellRendererTogglePrivate
{
gint indicator_size;
+ guint active : 1;
+ guint activatable : 1;
guint inconsistent : 1;
+ guint radio : 1;
};
-GType
-gtk_cell_renderer_toggle_get_type (void)
-{
- static GType cell_toggle_type = 0;
+G_DEFINE_TYPE (GtkCellRendererToggle, gtk_cell_renderer_toggle, GTK_TYPE_CELL_RENDERER)
- if (!cell_toggle_type)
- {
- static const GTypeInfo cell_toggle_info =
- {
- sizeof (GtkCellRendererToggleClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_cell_renderer_toggle_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkCellRendererToggle),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_cell_renderer_toggle_init,
- };
-
- cell_toggle_type =
- g_type_register_static (GTK_TYPE_CELL_RENDERER, I_("GtkCellRendererToggle"),
- &cell_toggle_info, 0);
- }
-
- return cell_toggle_type;
-}
static void
gtk_cell_renderer_toggle_init (GtkCellRendererToggle *celltoggle)
{
GtkCellRendererTogglePrivate *priv;
- priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (celltoggle);
+ celltoggle->priv = G_TYPE_INSTANCE_GET_PRIVATE (celltoggle,
+ GTK_TYPE_CELL_RENDERER_TOGGLE,
+ GtkCellRendererTogglePrivate);
+ priv = celltoggle->priv;
- celltoggle->activatable = TRUE;
- celltoggle->active = FALSE;
- celltoggle->radio = FALSE;
+ priv->activatable = TRUE;
+ priv->active = FALSE;
+ priv->radio = FALSE;
- GTK_CELL_RENDERER (celltoggle)->mode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
- GTK_CELL_RENDERER (celltoggle)->xpad = 2;
- GTK_CELL_RENDERER (celltoggle)->ypad = 2;
+ g_object_set (celltoggle, "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
+ gtk_cell_renderer_set_padding (GTK_CELL_RENDERER (celltoggle), 2, 2);
- priv->indicator_size = 12;
+ priv->indicator_size = TOGGLE_WIDTH;
priv->inconsistent = FALSE;
}
GParamSpec *pspec)
{
GtkCellRendererToggle *celltoggle = GTK_CELL_RENDERER_TOGGLE (object);
- GtkCellRendererTogglePrivate *priv;
+ GtkCellRendererTogglePrivate *priv = celltoggle->priv;
- priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (object);
-
switch (param_id)
{
case PROP_ACTIVE:
- g_value_set_boolean (value, celltoggle->active);
+ g_value_set_boolean (value, priv->active);
break;
case PROP_INCONSISTENT:
g_value_set_boolean (value, priv->inconsistent);
break;
case PROP_ACTIVATABLE:
- g_value_set_boolean (value, celltoggle->activatable);
+ g_value_set_boolean (value, priv->activatable);
break;
case PROP_RADIO:
- g_value_set_boolean (value, celltoggle->radio);
+ g_value_set_boolean (value, priv->radio);
break;
case PROP_INDICATOR_SIZE:
g_value_set_int (value, priv->indicator_size);
GParamSpec *pspec)
{
GtkCellRendererToggle *celltoggle = GTK_CELL_RENDERER_TOGGLE (object);
- GtkCellRendererTogglePrivate *priv;
-
- priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (object);
+ GtkCellRendererTogglePrivate *priv = celltoggle->priv;
switch (param_id)
{
case PROP_ACTIVE:
- celltoggle->active = g_value_get_boolean (value);
+ priv->active = g_value_get_boolean (value);
break;
case PROP_INCONSISTENT:
priv->inconsistent = g_value_get_boolean (value);
break;
case PROP_ACTIVATABLE:
- celltoggle->activatable = g_value_get_boolean (value);
+ priv->activatable = g_value_get_boolean (value);
break;
case PROP_RADIO:
- celltoggle->radio = g_value_get_boolean (value);
+ priv->radio = g_value_get_boolean (value);
break;
case PROP_INDICATOR_SIZE:
priv->indicator_size = g_value_get_int (value);
gint *width,
gint *height)
{
+ GtkCellRendererTogglePrivate *priv;
gint calc_width;
gint calc_height;
- GtkCellRendererTogglePrivate *priv;
+ gint xpad, ypad;
- priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell);
+ priv = GTK_CELL_RENDERER_TOGGLE (cell)->priv;
- calc_width = (gint) cell->xpad * 2 + priv->indicator_size;
- calc_height = (gint) cell->ypad * 2 + priv->indicator_size;
+ gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+ calc_width = xpad * 2 + priv->indicator_size;
+ calc_height = ypad * 2 + priv->indicator_size;
if (width)
*width = calc_width;
if (cell_area)
{
+ gfloat xalign, yalign;
+
+ gtk_cell_renderer_get_alignment (cell, &xalign, &yalign);
+
if (x_offset)
{
*x_offset = ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
- (1.0 - cell->xalign) : cell->xalign) * (cell_area->width - calc_width);
+ (1.0 - xalign) : xalign) * (cell_area->width - calc_width);
*x_offset = MAX (*x_offset, 0);
}
if (y_offset)
{
- *y_offset = cell->yalign * (cell_area->height - calc_height);
+ *y_offset = yalign * (cell_area->height - calc_height);
*y_offset = MAX (*y_offset, 0);
}
}
+ else
+ {
+ if (x_offset) *x_offset = 0;
+ if (y_offset) *y_offset = 0;
+ }
}
static void
gtk_cell_renderer_toggle_render (GtkCellRenderer *cell,
- GdkDrawable *window,
+ cairo_t *cr,
GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
GtkCellRendererState flags)
{
- GtkCellRendererToggle *celltoggle = (GtkCellRendererToggle *) cell;
- GtkCellRendererTogglePrivate *priv;
+ GtkCellRendererToggle *celltoggle = GTK_CELL_RENDERER_TOGGLE (cell);
+ GtkCellRendererTogglePrivate *priv = celltoggle->priv;
gint width, height;
gint x_offset, y_offset;
+ gint xpad, ypad;
GtkShadowType shadow;
GtkStateType state = 0;
- priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell);
-
- gtk_cell_renderer_toggle_get_size (cell, widget, cell_area,
+ gtk_cell_renderer_toggle_get_size (cell, widget, (GdkRectangle *) cell_area,
&x_offset, &y_offset,
&width, &height);
- width -= cell->xpad*2;
- height -= cell->ypad*2;
+ gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+ width -= xpad * 2;
+ height -= ypad * 2;
if (width <= 0 || height <= 0)
return;
if (priv->inconsistent)
shadow = GTK_SHADOW_ETCHED_IN;
else
- shadow = celltoggle->active ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
+ shadow = priv->active ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
- if (!cell->sensitive)
+ if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE ||
+ !gtk_cell_renderer_get_sensitive (cell))
{
state = GTK_STATE_INSENSITIVE;
}
else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
{
- if (GTK_WIDGET_HAS_FOCUS (widget))
+ if (gtk_widget_has_focus (widget))
state = GTK_STATE_SELECTED;
else
state = GTK_STATE_ACTIVE;
}
else
{
- if (celltoggle->activatable)
+ if (priv->activatable)
state = GTK_STATE_NORMAL;
else
state = GTK_STATE_INSENSITIVE;
}
- if (celltoggle->radio)
+ if (priv->radio)
{
- gtk_paint_option (widget->style,
- window,
- state, shadow,
- expose_area, widget, "cellradio",
- cell_area->x + x_offset + cell->xpad,
- cell_area->y + y_offset + cell->ypad,
- width - 1, height - 1);
+ gtk_paint_option (gtk_widget_get_style (widget),
+ cr,
+ state, shadow,
+ widget, "cellradio",
+ cell_area->x + x_offset + xpad,
+ cell_area->y + y_offset + ypad,
+ width, height);
}
else
{
- gtk_paint_check (widget->style,
- window,
- state, shadow,
- expose_area, widget, "cellcheck",
- cell_area->x + x_offset + cell->xpad,
- cell_area->y + y_offset + cell->ypad,
- width - 1, height - 1);
+ gtk_paint_check (gtk_widget_get_style (widget),
+ cr,
+ state, shadow,
+ widget, "cellcheck",
+ cell_area->x + x_offset + xpad,
+ cell_area->y + y_offset + ypad,
+ width, height);
}
}
GdkRectangle *cell_area,
GtkCellRendererState flags)
{
+ GtkCellRendererTogglePrivate *priv;
GtkCellRendererToggle *celltoggle;
-
+
celltoggle = GTK_CELL_RENDERER_TOGGLE (cell);
- if (celltoggle->activatable)
+ priv = celltoggle->priv;
+
+ if (priv->activatable)
{
g_signal_emit (cell, toggle_cell_signals[TOGGLED], 0, path);
return TRUE;
gtk_cell_renderer_toggle_set_radio (GtkCellRendererToggle *toggle,
gboolean radio)
{
+ GtkCellRendererTogglePrivate *priv;
+
g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle));
- toggle->radio = radio;
+ priv = toggle->priv;
+
+ priv->radio = radio;
}
/**
{
g_return_val_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle), FALSE);
- return toggle->radio;
+ return toggle->priv->radio;
}
/**
{
g_return_val_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle), FALSE);
- return toggle->active;
+ return toggle->priv->active;
}
/**
g_object_set (toggle, "active", setting ? TRUE : FALSE, NULL);
}
-#define __GTK_CELL_RENDERER_TOGGLE_C__
-#include "gtkaliasdef.c"
+/**
+ * gtk_cell_renderer_toggle_get_activatable:
+ * @toggle: a #GtkCellRendererToggle
+ *
+ * Returns whether the cell renderer is activatable. See
+ * gtk_cell_renderer_toggle_set_activatable().
+ *
+ * Return value: %TRUE if the cell renderer is activatable.
+ *
+ * Since: 2.18
+ **/
+gboolean
+gtk_cell_renderer_toggle_get_activatable (GtkCellRendererToggle *toggle)
+{
+ g_return_val_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle), FALSE);
+
+ return toggle->priv->activatable;
+}
+
+/**
+ * gtk_cell_renderer_toggle_set_activatable:
+ * @toggle: a #GtkCellRendererToggle.
+ * @setting: the value to set.
+ *
+ * Makes the cell renderer activatable.
+ *
+ * Since: 2.18
+ **/
+void
+gtk_cell_renderer_toggle_set_activatable (GtkCellRendererToggle *toggle,
+ gboolean setting)
+{
+ GtkCellRendererTogglePrivate *priv;
+
+ g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle));
+
+ priv = toggle->priv;
+
+ if (priv->activatable != setting)
+ {
+ priv->activatable = setting ? TRUE : FALSE;
+ g_object_notify (G_OBJECT (toggle), "activatable");
+ }
+}