/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 2011, 2012, 2015 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "ui/gui/pspp-sheet-selection.h"
#include "ui/gui/pspp-widget-facade.h"
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
#define P_(STRING) STRING
#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
/* Button signal handlers */
static gint pspp_sheet_view_column_button_event (GtkWidget *widget,
- GdkEvent *event,
+ GdkEventButton *event,
gpointer data);
static void pspp_sheet_view_column_button_clicked (GtkWidget *widget,
gpointer data);
static guint tree_column_signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE_WITH_CODE (PsppSheetViewColumn, pspp_sheet_view_column, GTK_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (PsppSheetViewColumn, pspp_sheet_view_column, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_LAYOUT,
pspp_sheet_view_column_cell_layout_init)
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
object_class->finalize = pspp_sheet_view_column_finalize;
object_class->set_property = pspp_sheet_view_column_set_property;
object_class->get_property = pspp_sheet_view_column_get_property;
-
+
tree_column_signals[CLICKED] =
g_signal_new ("clicked",
G_OBJECT_CLASS_TYPE (object_class),
P_("Whether to display the column"),
TRUE,
GTK_PARAM_READWRITE));
-
+
g_object_class_install_property (object_class,
PROP_RESIZABLE,
g_param_spec_boolean ("resizable",
P_("Column is user-resizable"),
FALSE,
GTK_PARAM_READWRITE));
-
+
g_object_class_install_property (object_class,
PROP_WIDTH,
g_param_spec_int ("width",
G_MAXINT,
0,
GTK_PARAM_READWRITE));
-
+
g_object_class_install_property (object_class,
PROP_FIXED_WIDTH,
g_param_spec_int ("fixed-width",
P_("Title to appear in column header"),
"",
GTK_PARAM_READWRITE));
-
+
g_object_class_install_property (object_class,
PROP_EXPAND,
g_param_spec_boolean ("expand",
P_("Column gets share of extra width allocated to the widget"),
FALSE,
GTK_PARAM_READWRITE));
-
+
g_object_class_install_property (object_class,
PROP_CLICKABLE,
g_param_spec_boolean ("clickable",
P_("Whether the header can be clicked"),
FALSE,
GTK_PARAM_READWRITE));
-
+
g_object_class_install_property (object_class,
PROP_WIDGET,
GTK_PARAM_READWRITE));
}
+
+static void _cell_layout_buildable_custom_tag_end (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ gpointer *data);
+
+
+static void _cell_layout_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type);
+
+
+static gboolean _cell_layout_buildable_custom_tag_start (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *tagname,
+ GMarkupParser *parser,
+ gpointer *data);
+
+
static void
pspp_sheet_view_column_buildable_init (GtkBuildableIface *iface)
{
- iface->add_child = _gtk_cell_layout_buildable_add_child;
- iface->custom_tag_start = _gtk_cell_layout_buildable_custom_tag_start;
- iface->custom_tag_end = _gtk_cell_layout_buildable_custom_tag_end;
+ iface->add_child = _cell_layout_buildable_add_child;
+ iface->custom_tag_start = _cell_layout_buildable_custom_tag_start;
+ iface->custom_tag_end = _cell_layout_buildable_custom_tag_end;
}
static void
pspp_sheet_view_column_init (PsppSheetViewColumn *tree_column)
{
tree_column->button = NULL;
- tree_column->xalign = 0.0;
+ tree_column->halign = GTK_ALIGN_START;
tree_column->width = 0;
tree_column->spacing = 0;
tree_column->requested_width = -1;
tree_column->use_resized_width = FALSE;
tree_column->title = g_strdup ("");
tree_column->quick_edit = TRUE;
- tree_column->need_button = FALSE;
}
static void
pspp_sheet_view_column_set_sort_order (tree_column,
g_value_get_enum (value));
break;
-
+
case PROP_SORT_COLUMN_ID:
pspp_sheet_view_column_set_sort_column_id (tree_column,
g_value_get_int (value));
g_value_set_enum (value,
pspp_sheet_view_column_get_sort_order (tree_column));
break;
-
+
case PROP_SORT_COLUMN_ID:
g_value_set_int (value,
pspp_sheet_view_column_get_sort_column_id (tree_column));
pspp_sheet_view_column_cell_layout_clear_attributes (cell_layout, info->cell);
g_object_unref (info->cell);
g_free (info);
- column->cell_list = g_list_delete_link (column->cell_list,
+ column->cell_list = g_list_delete_link (column->cell_list,
column->cell_list);
}
}
g_return_if_fail (PSPP_IS_SHEET_VIEW (tree_view));
g_return_if_fail (tree_column->button == NULL);
- gtk_widget_push_composite_child ();
tree_column->button = gtk_button_new ();
gtk_widget_add_events (tree_column->button, GDK_POINTER_MOTION_MASK);
- gtk_widget_pop_composite_child ();
/* make sure we own a reference to it as well. */
if (tree_view->priv->header_window)
G_CALLBACK (on_query_tooltip), tree_column);
g_object_set (tree_column->button, "has-tooltip", TRUE, NULL);
- tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 0.0, 0.0);
+ tree_column->bin = gtk_event_box_new ();
+ g_object_set (tree_column->bin, "halign", GTK_ALIGN_CENTER, NULL);
- hbox = gtk_hbox_new (FALSE, 2);
- tree_column->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
if (tree_column->child)
child = tree_column->child;
G_CALLBACK (pspp_sheet_view_column_mnemonic_activate),
tree_column);
- if (tree_column->xalign <= 0.5)
- gtk_box_pack_end (GTK_BOX (hbox), tree_column->arrow, FALSE, FALSE, 0);
- else
- gtk_box_pack_start (GTK_BOX (hbox), tree_column->arrow, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), tree_column->alignment, TRUE, TRUE, 0);
-
- gtk_container_add (GTK_CONTAINER (tree_column->alignment), child);
+ gtk_box_pack_start (GTK_BOX (hbox), tree_column->bin, TRUE, TRUE, 0);
+
+ gtk_container_add (GTK_CONTAINER (tree_column->bin), child);
gtk_container_add (GTK_CONTAINER (tree_column->button), hbox);
gtk_widget_show (hbox);
- gtk_widget_show (tree_column->alignment);
+ gtk_widget_show (tree_column->bin);
pspp_sheet_view_column_update_button (tree_column);
}
-void
+void
pspp_sheet_view_column_update_button (PsppSheetViewColumn *tree_column)
{
gint sort_column_id = -1;
- GtkWidget *hbox;
GtkWidget *alignment;
- GtkWidget *arrow;
GtkWidget *current_child;
- GtkArrowType arrow_type = GTK_ARROW_NONE;
GtkTreeModel *model;
gboolean can_focus;
model = NULL;
/* Create a button if necessary */
- if (tree_column->need_button &&
- tree_column->visible &&
+ if (tree_column->visible &&
tree_column->button == NULL &&
tree_column->tree_view &&
gtk_widget_get_realized (tree_column->tree_view))
pspp_sheet_view_column_create_button (tree_column);
-
+
if (! tree_column->button)
return;
- hbox = GTK_BIN (tree_column->button)->child;
- alignment = tree_column->alignment;
- arrow = tree_column->arrow;
- current_child = GTK_BIN (alignment)->child;
+ alignment = tree_column->bin;
+ current_child = gtk_bin_get_child (GTK_BIN (alignment));
/* Set up the actual button */
- gtk_alignment_set (GTK_ALIGNMENT (alignment), tree_column->xalign,
- 0.5, 0.0, 0.0);
-
+ g_object_set (alignment,
+ "halign", tree_column->halign,
+ "valign", GTK_ALIGN_CENTER, NULL);
+
if (tree_column->child)
{
if (current_child != tree_column->child)
tree_column->child);
}
}
- else
+ else
{
if (current_child == NULL)
{
&sort_column_id,
NULL);
- if (tree_column->show_sort_indicator)
- {
- gboolean alternative;
-
- g_object_get (gtk_widget_get_settings (tree_column->tree_view),
- "gtk-alternative-sort-arrows", &alternative,
- NULL);
-
- switch (tree_column->sort_order)
- {
- case GTK_SORT_ASCENDING:
- arrow_type = alternative ? GTK_ARROW_UP : GTK_ARROW_DOWN;
- break;
-
- case GTK_SORT_DESCENDING:
- arrow_type = alternative ? GTK_ARROW_DOWN : GTK_ARROW_UP;
- break;
-
- default:
- g_warning (G_STRLOC": bad sort order");
- break;
- }
- }
-
- gtk_arrow_set (GTK_ARROW (arrow),
- arrow_type,
- GTK_SHADOW_IN);
-
- /* Put arrow on the right if the text is left-or-center justified, and on the
- * left otherwise; do this by packing boxes, so flipping text direction will
- * reverse things
- */
- g_object_ref (arrow);
- gtk_container_remove (GTK_CONTAINER (hbox), arrow);
-
- if (tree_column->xalign <= 0.5)
- {
- gtk_box_pack_end (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
- }
- else
- {
- gtk_box_pack_start (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
- /* move it to the front */
- gtk_box_reorder_child (GTK_BOX (hbox), arrow, 0);
- }
- g_object_unref (arrow);
-
- if (tree_column->show_sort_indicator
- || (GTK_IS_TREE_SORTABLE (model) && tree_column->sort_column_id >= 0))
- gtk_widget_show (arrow);
- else
- gtk_widget_hide (arrow);
/* It's always safe to hide the button. It isn't always safe to show it, as
* if you show it before it's realized, it'll get the wrong window. */
{
if (tree_column->visible)
{
- gtk_widget_show_now (tree_column->button);
+ gtk_widget_show (tree_column->button);
if (tree_column->window)
{
if (tree_column->resizable)
static gint
pspp_sheet_view_column_button_event (GtkWidget *widget,
- GdkEvent *event,
+ GdkEventButton *event,
gpointer data)
{
PsppSheetViewColumn *column = (PsppSheetViewColumn *) data;
((GdkEventButton *)event)->button == 1)
{
column->maybe_reordered = TRUE;
- gdk_window_get_pointer (GTK_BUTTON (widget)->event_window,
+ gdk_window_get_device_position (gtk_button_get_event_window (GTK_BUTTON (widget)),
+ event->device,
&column->drag_x,
&column->drag_y,
NULL);
if (event->type == GDK_BUTTON_RELEASE ||
event->type == GDK_LEAVE_NOTIFY)
column->maybe_reordered = FALSE;
-
+
if (event->type == GDK_MOTION_NOTIFY &&
column->maybe_reordered &&
(gtk_drag_check_threshold (widget,
g_signal_connect (model, "sort-column-changed",
G_CALLBACK (pspp_sheet_view_model_sort_column_changed),
tree_column);
-
+
if (gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
&real_sort_column_id,
&real_order) &&
pspp_sheet_view_column_set_sort_indicator (tree_column, TRUE);
pspp_sheet_view_column_set_sort_order (tree_column, real_order);
}
- else
+ else
{
pspp_sheet_view_column_set_sort_indicator (tree_column, FALSE);
}
void
_pspp_sheet_view_column_realize_button (PsppSheetViewColumn *column)
{
+ GtkAllocation allocation;
PsppSheetView *tree_view;
GdkWindowAttr attr;
guint attributes_mask;
g_return_if_fail (PSPP_IS_SHEET_VIEW (tree_view));
g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (tree_view)));
g_return_if_fail (tree_view->priv->header_window != NULL);
- if (!column->need_button || !column->button)
+ if (!column->button)
return;
g_return_if_fail (column->button != NULL);
attr.window_type = GDK_WINDOW_CHILD;
attr.wclass = GDK_INPUT_ONLY;
attr.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
- attr.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
attr.event_mask = gtk_widget_get_events (GTK_WIDGET (tree_view)) |
(GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_HINT_MASK |
GDK_KEY_PRESS_MASK);
attributes_mask = GDK_WA_CURSOR | GDK_WA_X | GDK_WA_Y;
- attr.cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (tree_view->priv->header_window),
+ attr.cursor = gdk_cursor_new_for_display (gdk_window_get_display (tree_view->priv->header_window),
GDK_SB_H_DOUBLE_ARROW);
attr.y = 0;
attr.width = TREE_VIEW_DRAG_WIDTH;
attr.height = tree_view->priv->header_height;
-
- attr.x = (column->button->allocation.x + (rtl ? 0 : column->button->allocation.width)) - TREE_VIEW_DRAG_WIDTH / 2;
+ gtk_widget_get_allocation (column->button, &allocation);
+ attr.x = (allocation.x + (rtl ? 0 : allocation.width)) - TREE_VIEW_DRAG_WIDTH / 2;
column->window = gdk_window_new (tree_view->priv->header_window,
&attr, attributes_mask);
gdk_window_set_user_data (column->window, tree_view);
pspp_sheet_view_column_update_button (column);
- gdk_cursor_unref (attr.cursor);
+ g_object_unref (attr.cursor);
}
void
g_assert (column->tree_view == NULL);
column->tree_view = GTK_WIDGET (tree_view);
- if (column->need_button)
- pspp_sheet_view_column_create_button (column);
+ pspp_sheet_view_column_create_button (column);
column->property_changed_signal =
g_signal_connect_swapped (tree_view,
GList *list;
for (list = column->cell_list; list; list = list->next)
- if (((PsppSheetViewColumnCellInfo *)list->data)->cell->mode ==
- GTK_CELL_RENDERER_MODE_EDITABLE)
- return TRUE;
+ {
+ GtkCellRendererMode mode;
+ g_object_get (((PsppSheetViewColumnCellInfo *)list->data)->cell, "mode", &mode, NULL);
+ if (mode == GTK_CELL_RENDERER_MODE_EDITABLE)
+ return TRUE;
+ }
return FALSE;
}
{
PsppSheetViewColumnCellInfo *cellinfo = list->data;
- if ((cellinfo->cell->mode == GTK_CELL_RENDERER_MODE_EDITABLE ||
- cellinfo->cell->mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE) &&
- cellinfo->cell->visible)
+ GtkCellRendererMode mode;
+ g_object_get (cellinfo->cell, "mode", &mode, NULL);
+
+ if ((mode == GTK_CELL_RENDERER_MODE_EDITABLE ||
+ mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE) &&
+ gtk_cell_renderer_get_visible (cellinfo->cell))
i++;
}
/**
* pspp_sheet_view_column_new:
- *
+ *
* Creates a new #PsppSheetViewColumn.
- *
+ *
* Return value: A newly created #PsppSheetViewColumn.
**/
PsppSheetViewColumn *
* @title: The title to set the header to.
* @cell: The #GtkCellRenderer.
* @Varargs: A %NULL-terminated list of attributes.
- *
+ *
* Creates a new #PsppSheetViewColumn with a number of default values. This is
* equivalent to calling pspp_sheet_view_column_set_title(),
* pspp_sheet_view_column_pack_start(), and
* {
* PsppSheetViewColumn *column;
* GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
- *
+ *
* column = pspp_sheet_view_column_new_with_attributes ("Title",
* renderer,
* "text", TEXT_COLUMN,
* NULL);
* }
* ]|
- *
+ *
* Return value: A newly created #PsppSheetViewColumn.
**/
PsppSheetViewColumn *
/**
* pspp_sheet_view_column_pack_start:
* @tree_column: A #PsppSheetViewColumn.
- * @cell: The #GtkCellRenderer.
+ * @cell: The #GtkCellRenderer.
* @expand: %TRUE if @cell is to be given extra space allocated to @tree_column.
*
* Packs the @cell into the beginning of the column. If @expand is %FALSE, then
/**
* pspp_sheet_view_column_pack_end:
* @tree_column: A #PsppSheetViewColumn.
- * @cell: The #GtkCellRenderer.
+ * @cell: The #GtkCellRenderer.
* @expand: %TRUE if @cell is to be given extra space allocated to @tree_column.
*
* Adds the @cell to end of the column. If @expand is %FALSE, then the @cell
/**
* pspp_sheet_view_column_clear:
* @tree_column: A #PsppSheetViewColumn
- *
+ *
* Unsets all the mappings on all renderers on the @tree_column.
**/
void
* @cell_renderer: the #GtkCellRenderer to set attributes on
* @attribute: An attribute on the renderer
* @column: The column position on the model to get the attribute from.
- *
+ *
* Adds an attribute mapping to the list in @tree_column. The @column is the
* column of the model to get a value from, and the @attribute is the
* parameter on @cell_renderer to be set from the value. So for example
attribute = va_arg (args, gchar *);
pspp_sheet_view_column_clear_attributes (tree_column, cell_renderer);
-
+
while (attribute != NULL)
{
column = va_arg (args, gint);
* @tree_column: A #PsppSheetViewColumn.
* @cell_renderer: the #GtkCellRenderer we're setting the attributes of
* @Varargs: A %NULL-terminated list of attributes.
- *
+ *
* Sets the attributes in the list as the attributes of @tree_column.
* The attributes should be in attribute/column order, as in
* pspp_sheet_view_column_add_attribute(). All existing attributes
* pspp_sheet_view_column_set_cell_data_func:
* @tree_column: A #PsppSheetViewColumn
* @cell_renderer: A #GtkCellRenderer
- * @func: The #PsppSheetViewColumnFunc to use.
+ * @func: The #PsppSheetViewColumnFunc to use.
* @func_data: The user data for @func.
* @destroy: The destroy notification for @func_data
- *
+ *
* Sets the #PsppSheetViewColumnFunc to use for the column. This
* function is used instead of the standard attributes mapping for
* setting the column value, and should set the value of @tree_column's
* pspp_sheet_view_column_clear_attributes:
* @tree_column: a #PsppSheetViewColumn
* @cell_renderer: a #GtkCellRenderer to clear the attribute mapping on.
- *
+ *
* Clears all existing attributes previously set with
* pspp_sheet_view_column_set_attributes().
**/
* pspp_sheet_view_column_set_spacing:
* @tree_column: A #PsppSheetViewColumn.
* @spacing: distance between cell renderers in pixels.
- *
+ *
* Sets the spacing field of @tree_column, which is the number of pixels to
* place between cell renderers packed into it.
**/
/**
* pspp_sheet_view_column_get_spacing:
* @tree_column: A #PsppSheetViewColumn.
- *
+ *
* Returns the spacing of @tree_column.
- *
+ *
* Return value: the spacing of @tree_column.
**/
gint
* pspp_sheet_view_column_set_visible:
* @tree_column: A #PsppSheetViewColumn.
* @visible: %TRUE if the @tree_column is visible.
- *
+ *
* Sets the visibility of @tree_column.
**/
void
g_return_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column));
visible = !! visible;
-
+
if (tree_column->visible == visible)
return;
/**
* pspp_sheet_view_column_get_visible:
* @tree_column: A #PsppSheetViewColumn.
- *
+ *
* Returns %TRUE if @tree_column is visible.
- *
+ *
* Return value: whether the column is visible or not. If it is visible, then
* the tree will show the column.
**/
* pspp_sheet_view_column_set_resizable:
* @tree_column: A #PsppSheetViewColumn
* @resizable: %TRUE, if the column can be resized
- *
+ *
* If @resizable is %TRUE, then the user can explicitly resize the column by
* grabbing the outer edge of the column button.
**/
/**
* pspp_sheet_view_column_get_resizable:
* @tree_column: A #PsppSheetViewColumn
- *
+ *
* Returns %TRUE if the @tree_column can be resized by the end user.
- *
+ *
* Return value: %TRUE, if the @tree_column can be resized.
**/
gboolean
/**
* pspp_sheet_view_column_get_width:
* @tree_column: A #PsppSheetViewColumn.
- *
+ *
* Returns the current size of @tree_column in pixels.
- *
+ *
* Return value: The current width of @tree_column.
**/
gint
* pspp_sheet_view_column_set_fixed_width:
* @tree_column: A #PsppSheetViewColumn.
* @fixed_width: The size to set @tree_column to. Must be greater than 0.
- *
+ *
* Sets the size of the column in pixels. The size of the column is clamped to
* the min/max width for the column. Please note that the min/max width of the
* column doesn't actually affect the "fixed_width" property of the widget, just
/**
* pspp_sheet_view_column_get_fixed_width:
* @tree_column: a #PsppSheetViewColumn
- *
+ *
* Gets the fixed width of the column. This value is only meaning may not be
* the actual width of the column on the screen, just what is requested.
- *
+ *
* Return value: the fixed width of the column
**/
gint
* pspp_sheet_view_column_set_min_width:
* @tree_column: A #PsppSheetViewColumn.
* @min_width: The minimum width of the column in pixels, or -1.
- *
+ *
* Sets the minimum width of the @tree_column. If @min_width is -1, then the
* minimum width is unset.
**/
/**
* pspp_sheet_view_column_get_min_width:
* @tree_column: A #PsppSheetViewColumn.
- *
+ *
* Returns the minimum width in pixels of the @tree_column, or -1 if no minimum
* width is set.
- *
+ *
* Return value: The minimum width of the @tree_column.
**/
gint
* pspp_sheet_view_column_set_max_width:
* @tree_column: A #PsppSheetViewColumn.
* @max_width: The maximum width of the column in pixels, or -1.
- *
+ *
* Sets the maximum width of the @tree_column. If @max_width is -1, then the
* maximum width is unset. Note, the column can actually be wider than max
* width if it's the last column in a view. In this case, the column expands to
/**
* pspp_sheet_view_column_get_max_width:
* @tree_column: A #PsppSheetViewColumn.
- *
+ *
* Returns the maximum width in pixels of the @tree_column, or -1 if no maximum
* width is set.
- *
+ *
* Return value: The maximum width of the @tree_column.
**/
gint
/**
* pspp_sheet_view_column_clicked:
* @tree_column: a #PsppSheetViewColumn
- *
+ *
* Emits the "clicked" signal on the column. This function will only work if
* @tree_column is clickable.
**/
* pspp_sheet_view_column_set_title:
* @tree_column: A #PsppSheetViewColumn.
* @title: The title of the @tree_column.
- *
+ *
* Sets the title of the @tree_column. If a custom widget has been set, then
* this value is ignored.
**/
const gchar *title)
{
gchar *new_title;
-
+
g_return_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column));
new_title = g_strdup (title);
/**
* pspp_sheet_view_column_get_title:
* @tree_column: A #PsppSheetViewColumn.
- *
+ *
* Returns the title of the widget.
- *
+ *
* Return value: the title of the column. This string should not be
* modified or freed.
**/
-G_CONST_RETURN gchar *
+const gchar *
pspp_sheet_view_column_get_title (PsppSheetViewColumn *tree_column)
{
g_return_val_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column), NULL);
* pspp_sheet_view_column_set_expand:
* @tree_column: A #PsppSheetViewColumn
* @expand: %TRUE if the column should take available extra space, %FALSE if not
- *
+ *
* Sets the column to take available extra space. This space is shared equally
* amongst all columns that have the expand set to %TRUE. If no column has this
* option set, then the last column gets all extra space. By default, every
/**
* pspp_sheet_view_column_get_expand:
* @tree_column: a #PsppSheetViewColumn
- *
+ *
* Return %TRUE if the column expands to take any available space.
- *
+ *
* Return value: %TRUE, if the column expands
*
* Since: 2.4
* pspp_sheet_view_column_set_clickable:
* @tree_column: A #PsppSheetViewColumn.
* @clickable: %TRUE if the header is active.
- *
+ *
* Sets the header to be active if @active is %TRUE. When the header is active,
* then it can take keyboard focus, and can be clicked.
**/
/**
* pspp_sheet_view_column_get_clickable:
* @tree_column: a #PsppSheetViewColumn
- *
+ *
* Returns %TRUE if the user can click on the header for the column.
- *
+ *
* Return value: %TRUE if user can click the column header.
**/
gboolean
if (widget)
g_object_ref_sink (widget);
- if (tree_column->child)
+ if (tree_column->child)
g_object_unref (tree_column->child);
tree_column->child = widget;
/**
* pspp_sheet_view_column_get_widget:
* @tree_column: A #PsppSheetViewColumn.
- *
+ *
* Returns the #GtkWidget in the button on the column header. If a custom
* widget has not been set then %NULL is returned.
- *
+ *
* Return value: The #GtkWidget in the column header, or %NULL
**/
GtkWidget *
* pspp_sheet_view_column_set_alignment:
* @tree_column: A #PsppSheetViewColumn.
* @xalign: The alignment, which is between [0.0 and 1.0] inclusive.
- *
+ *
* Sets the alignment of the title or custom widget inside the column header.
- * The alignment determines its location inside the button -- 0.0 for left, 0.5
- * for center, 1.0 for right.
+ * The alignment determines its location inside the button.
**/
void
pspp_sheet_view_column_set_alignment (PsppSheetViewColumn *tree_column,
- gfloat xalign)
+ GtkAlign xalign)
{
g_return_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column));
- xalign = CLAMP (xalign, 0.0, 1.0);
- if (tree_column->xalign == xalign)
+ if (tree_column->halign == xalign)
return;
- tree_column->xalign = xalign;
+ tree_column->halign = xalign;
pspp_sheet_view_column_update_button (tree_column);
g_object_notify (G_OBJECT (tree_column), "alignment");
}
/**
* pspp_sheet_view_column_get_alignment:
* @tree_column: A #PsppSheetViewColumn.
- *
- * Returns the current x alignment of @tree_column. This value can range
- * between 0.0 and 1.0.
- *
+ *
+ * Returns the current x alignment of @tree_column.
+ *
* Return value: The current alignent of @tree_column.
**/
-gfloat
+GtkAlign
pspp_sheet_view_column_get_alignment (PsppSheetViewColumn *tree_column)
{
- g_return_val_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column), 0.5);
+ g_return_val_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column), GTK_ALIGN_CENTER);
- return tree_column->xalign;
+ return tree_column->halign;
}
+
/**
* pspp_sheet_view_column_set_reorderable:
* @tree_column: A #PsppSheetViewColumn
* @reorderable: %TRUE, if the column can be reordered.
- *
+ *
* If @reorderable is %TRUE, then the column can be reordered by the end user
* dragging the header.
**/
/**
* pspp_sheet_view_column_get_reorderable:
* @tree_column: A #PsppSheetViewColumn
- *
+ *
* Returns %TRUE if the @tree_column can be reordered by the user.
- *
+ *
* Return value: %TRUE if the @tree_column can be reordered by the user.
**/
gboolean
* @tree_column: a #PsppSheetViewColumn
* @sort_column_id: The @sort_column_id of the model to sort on.
*
- * Sets the logical @sort_column_id that this column sorts on when this column
+ * Sets the logical @sort_column_id that this column sorts on when this column
* is selected for sorting. Doing so makes the column header clickable.
**/
void
* the header button indicating the column is sorted. Call
* pspp_sheet_view_column_set_sort_order() to change the direction of
* the arrow.
- *
+ *
**/
void
pspp_sheet_view_column_set_sort_indicator (PsppSheetViewColumn *tree_column,
/**
* pspp_sheet_view_column_get_sort_indicator:
* @tree_column: a #PsppSheetViewColumn
- *
+ *
* Gets the value set by pspp_sheet_view_column_set_sort_indicator().
- *
+ *
* Return value: whether the sort indicator arrow is displayed
**/
gboolean
* @tree_column: a #PsppSheetViewColumn
* @order: sort order that the sort indicator should indicate
*
- * Changes the appearance of the sort indicator.
- *
+ * Changes the appearance of the sort indicator.
+ *
* This <emphasis>does not</emphasis> actually sort the model. Use
* pspp_sheet_view_column_set_sort_column_id() if you want automatic sorting
* support. This function is primarily for custom sorting behavior, and should
* be used in conjunction with gtk_tree_sortable_set_sort_column() to do
- * that. For custom models, the mechanism will vary.
- *
+ * that. For custom models, the mechanism will vary.
+ *
* The sort indicator changes direction to indicate normal sort or reverse sort.
- * Note that you must have the sort indicator enabled to see anything when
+ * Note that you must have the sort indicator enabled to see anything when
* calling this function; see pspp_sheet_view_column_set_sort_indicator().
**/
void
/**
* pspp_sheet_view_column_get_sort_order:
* @tree_column: a #PsppSheetViewColumn
- *
+ *
* Gets the value set by pspp_sheet_view_column_set_sort_order().
- *
+ *
* Return value: the sort order the sort indicator is indicating
**/
GtkSortType
* @tree_column: A #PsppSheetViewColumn.
* @tree_model: The #GtkTreeModel to to get the cell renderers attributes from.
* @iter: The #GtkTreeIter to to get the cell renderer's attributes from.
- *
+ *
* Sets the cell renderer based on the @tree_model and @iter. That is, for
* every attribute mapping in @tree_column, it will get a value from the set
* column on the @iter, and use that value to set the attribute on the cell
* @y_offset: (allow-none): location to return y offset of a cell relative to @cell_area, or %NULL
* @width: (allow-none): location to return width needed to render a cell, or %NULL
* @height: (allow-none): location to return height needed to render a cell, or %NULL
- *
+ *
* Obtains the width and height needed to render the column. This is used
* primarily by the #PsppSheetView.
**/
* width = 0;
gtk_widget_style_get (tree_column->tree_view, "focus-line-width", &focus_line_width, NULL);
-
+
for (list = tree_column->cell_list; list; list = list->next)
{
PsppSheetViewColumnCellInfo *info = (PsppSheetViewColumnCellInfo *) list->data;
if (first_cell == FALSE && width)
*width += tree_column->spacing;
- gtk_cell_renderer_get_size (info->cell,
- tree_column->tree_view,
- cell_area,
- x_offset,
- y_offset,
- &new_width,
- &new_height);
+ gtk_cell_renderer_get_padding (info->cell, x_offset, y_offset);
+ gtk_cell_renderer_get_preferred_width (info->cell, tree_column->tree_view,
+ NULL, &new_width);
+
+ gtk_cell_renderer_get_preferred_height (info->cell, tree_column->tree_view,
+ NULL, &new_height);
+
if (height)
* height = MAX (*height, new_height + focus_line_width * 2);
static gboolean
pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn *tree_column,
- GdkWindow *window,
+ cairo_t *cr,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
guint flags,
gint action,
- const GdkRectangle *expose_area, /* RENDER */
GdkRectangle *focus_rectangle, /* FOCUS */
GtkCellEditable **editable_widget, /* EVENT */
GdkEvent *event, /* EVENT */
GList *list;
GdkRectangle real_cell_area;
GdkRectangle real_background_area;
- GdkRectangle real_expose_area = *cell_area;
gint depth = 0;
gint expand_cell_count = 0;
gint full_requested_width = 0;
{
PsppSheetViewColumnCellInfo *info = (PsppSheetViewColumnCellInfo *)list->data;
- if (! info->cell->visible)
+ if (! gtk_cell_renderer_get_visible (info->cell))
continue;
if (info->expand == TRUE)
if (info->pack == GTK_PACK_END)
continue;
- if (! info->cell->visible)
+ if (! gtk_cell_renderer_get_visible (info->cell))
continue;
if ((info->has_focus || special_cells == 1) && cursor_row)
if (real_cell_area.x - focus_line_width + info->real_width > cell_area->x + cell_area->width)
{
info->real_width = cell_area->x + cell_area->width - real_cell_area.x;
- }
+ }
if (real_cell_area.x > cell_area->x + cell_area->width)
break;
rtl_cell_area = real_cell_area;
rtl_background_area = real_background_area;
-
+
if (rtl)
{
rtl_cell_area.x = cell_area->x + cell_area->width - (real_cell_area.x - cell_area->x) - real_cell_area.width;
if (action == CELL_ACTION_RENDER)
{
gtk_cell_renderer_render (info->cell,
- window,
+ cr,
tree_column->tree_view,
&rtl_background_area,
&rtl_cell_area,
- &real_expose_area,
flags);
}
/* FOCUS */
{
gint x_offset, y_offset, width, height;
- gtk_cell_renderer_get_size (info->cell,
- tree_column->tree_view,
- &rtl_cell_area,
- &x_offset, &y_offset,
- &width, &height);
+ gtk_cell_renderer_get_preferred_height (info->cell, tree_column->tree_view,
+ NULL, &height);
+
+ gtk_cell_renderer_get_preferred_width (info->cell, tree_column->tree_view,
+ NULL, &width);
+
+
+ gtk_cell_renderer_get_padding (info->cell,
+ &x_offset, &y_offset);
if (special_cells > 1)
{
g_return_val_if_fail (GTK_IS_CELL_EDITABLE (*editable_widget), FALSE);
info->in_editing_mode = TRUE;
pspp_sheet_view_column_focus_cell (tree_column, info->cell);
-
+
flags &= ~GTK_CELL_RENDERER_FOCUSED;
return TRUE;
if (info->pack == GTK_PACK_START)
continue;
- if (! info->cell->visible)
+ if (! gtk_cell_renderer_get_visible (info->cell))
continue;
if ((info->has_focus || special_cells == 1) && cursor_row)
if (real_cell_area.x - focus_line_width + info->real_width > cell_area->x + cell_area->width)
{
info->real_width = cell_area->x + cell_area->width - real_cell_area.x;
- }
+ }
if (real_cell_area.x > cell_area->x + cell_area->width)
break;
if (action == CELL_ACTION_RENDER)
{
gtk_cell_renderer_render (info->cell,
- window,
+ cr,
tree_column->tree_view,
&rtl_background_area,
&rtl_cell_area,
- &real_expose_area,
flags);
}
/* FOCUS */
{
gint x_offset, y_offset, width, height;
- gtk_cell_renderer_get_size (info->cell,
- tree_column->tree_view,
- &rtl_cell_area,
- &x_offset, &y_offset,
- &width, &height);
+ gtk_cell_renderer_get_preferred_height (info->cell, tree_column->tree_view,
+ NULL, &height);
+
+ gtk_cell_renderer_get_preferred_width (info->cell, tree_column->tree_view,
+ NULL, &width);
+
+
+ gtk_cell_renderer_get_padding (info->cell,
+ &x_offset, &y_offset);
if (special_cells > 1)
{
* @window: a #GdkDrawable to draw to
* @background_area: entire cell area (including tree expanders and maybe padding on the sides)
* @cell_area: area normally rendered by a cell renderer
- * @expose_area: area that actually needs updating
* @flags: flags that affect rendering
- *
+ *
* Renders the cell contained by #tree_column. This is used primarily by the
* #PsppSheetView.
**/
void
_pspp_sheet_view_column_cell_render (PsppSheetViewColumn *tree_column,
- GdkWindow *window,
+ cairo_t *cr,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
- const GdkRectangle *expose_area,
guint flags)
{
g_return_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column));
g_return_if_fail (background_area != NULL);
g_return_if_fail (cell_area != NULL);
- g_return_if_fail (expose_area != NULL);
pspp_sheet_view_column_cell_process_action (tree_column,
- window,
+ cr,
background_area,
cell_area,
flags,
CELL_ACTION_RENDER,
- expose_area,
NULL, NULL, NULL, NULL);
}
cell_area,
flags,
CELL_ACTION_EVENT,
- NULL, NULL,
+ NULL,
editable_widget,
event,
path_string);
cell_area,
0,
CELL_ACTION_FOCUS,
- NULL,
focus_area,
NULL, NULL, NULL);
}
return NULL;
}
+
static GList *
pspp_sheet_view_column_cell_next (PsppSheetViewColumn *tree_column,
GList *current)
void
_pspp_sheet_view_column_cell_draw_focus (PsppSheetViewColumn *tree_column,
- GdkWindow *window,
+ cairo_t *cr,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
- const GdkRectangle *expose_area,
guint flags)
{
gint focus_line_width;
GtkStateType cell_state;
-
+
g_return_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column));
gtk_widget_style_get (GTK_WIDGET (tree_column->tree_view),
"focus-line-width", &focus_line_width, NULL);
cell_area->y - focus_line_width,
cell_area->width + 2 * focus_line_width,
cell_area->height + 2 * focus_line_width);
-#endif
+#endif
}
else
{
GdkRectangle focus_rectangle;
pspp_sheet_view_column_cell_process_action (tree_column,
- window,
+ cr,
background_area,
cell_area,
flags,
CELL_ACTION_FOCUS,
- expose_area,
&focus_rectangle,
NULL, NULL, NULL);
cell_state = flags & GTK_CELL_RENDERER_SELECTED ? GTK_STATE_SELECTED :
(flags & GTK_CELL_RENDERER_PRELIT ? GTK_STATE_PRELIGHT :
(flags & GTK_CELL_RENDERER_INSENSITIVE ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL));
- gtk_paint_focus (tree_column->tree_view->style,
- window,
+
+ gtk_paint_focus (gtk_widget_get_style (GTK_WIDGET (tree_column->tree_view)),
+ cr,
cell_state,
- cell_area,
tree_column->tree_view,
"treeview",
focus_rectangle.x,
/**
* pspp_sheet_view_column_cell_is_visible:
* @tree_column: A #PsppSheetViewColumn
- *
+ *
* Returns %TRUE if any of the cells packed into the @tree_column are visible.
* For this to be meaningful, you must first initialize the cells with
* pspp_sheet_view_column_cell_set_cell_data()
- *
+ *
* Return value: %TRUE, if any of the cells packed into the @tree_column are currently visible
**/
gboolean
{
PsppSheetViewColumnCellInfo *info = (PsppSheetViewColumnCellInfo *) list->data;
- if (info->cell->visible)
+ if (gtk_cell_renderer_get_visible (info->cell))
return TRUE;
}
tree_column->width = 0;
if (tree_column->tree_view &&
+ PSPP_SHEET_VIEW (tree_column->tree_view)->priv->resized &&
gtk_widget_get_realized (tree_column->tree_view))
{
+ PSPP_SHEET_VIEW (tree_column->tree_view)->priv->resized = FALSE;
_pspp_sheet_view_install_mark_rows_col_dirty (PSPP_SHEET_VIEW (tree_column->tree_view));
gtk_widget_queue_resize (tree_column->tree_view);
}
l = r = 0;
- list = pspp_sheet_view_column_cell_first (column);
+ list = pspp_sheet_view_column_cell_first (column);
while (list)
{
info = (PsppSheetViewColumnCellInfo *)list->data;
-
+
list = pspp_sheet_view_column_cell_next (column, list);
if (info->cell == cell)
break;
-
- if (info->cell->visible)
+
+ if (gtk_cell_renderer_get_visible (info->cell))
l += info->real_width + column->spacing;
}
while (list)
{
info = (PsppSheetViewColumnCellInfo *)list->data;
-
+
list = pspp_sheet_view_column_cell_next (column, list);
- if (info->cell->visible)
+ if (gtk_cell_renderer_get_visible (info->cell))
r += info->real_width + column->spacing;
}
* Obtains the horizontal position and size of a cell in a column. If the
* cell is not found in the column, @start_pos and @width are not changed and
* %FALSE is returned.
- *
+ *
* Return value: %TRUE if @cell belongs to @tree_column.
*/
gboolean
break;
}
- if (cellinfo->cell->visible)
+ if (gtk_cell_renderer_get_visible (cellinfo->cell))
current_x += cellinfo->real_width;
}
glong l;
gchar *endptr;
gchar *string;
-
+
if (!parser_data->attr_name)
return;
l = strtol (string, &endptr, 0);
if (errno || endptr == string)
{
- g_set_error (error,
+ g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE,
"Could not parse integer `%s'",
attributes_text_element,
};
-gboolean
-_gtk_cell_layout_buildable_custom_tag_start (GtkBuildable *buildable,
+static gboolean
+_cell_layout_buildable_custom_tag_start (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
return FALSE;
}
-void
-_gtk_cell_layout_buildable_custom_tag_end (GtkBuildable *buildable,
+static void
+_cell_layout_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
g_slice_free (AttributesSubParserData, parser_data);
}
-void
-_gtk_cell_layout_buildable_add_child (GtkBuildable *buildable,
+static void
+_cell_layout_buildable_add_child (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *type)
{
GtkCellLayoutIface *iface;
-
+
g_return_if_fail (GTK_IS_CELL_LAYOUT (buildable));
g_return_if_fail (GTK_IS_CELL_RENDERER (child));
if (tree_column->button)
{
- gtk_widget_size_request (tree_column->button, request);
+ gtk_widget_get_preferred_size (tree_column->button, NULL, request);
return;
}
{
return tree_column->reorderable || tree_column->clickable;
}
-
-void
-pspp_sheet_view_column_set_need_button (PsppSheetViewColumn *tree_column,
- gboolean need_button)
-{
- if (tree_column->need_button != need_button)
- {
- tree_column->need_button = need_button;
- pspp_sheet_view_column_update_button (tree_column);
- _pspp_sheet_view_column_realize_button (tree_column);
- }
-}
projects / pspp / blobdiff