/* 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
/* 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);
tree_column->use_resized_width = FALSE;
tree_column->title = g_strdup ("");
tree_column->quick_edit = TRUE;
- tree_column->need_button = FALSE;
}
static void
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)
tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 0.0, 0.0);
- 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);
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))
if (! tree_column->button)
return;
- hbox = gtk_bin_get_child (GTK_BIN (tree_column->button));
alignment = tree_column->alignment;
- arrow = tree_column->arrow;
current_child = gtk_bin_get_child (GTK_BIN (alignment));
/* Set up the actual button */
&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_get_event_window (GTK_BUTTON (widget)),
+ gdk_window_get_device_position (gtk_button_get_event_window (GTK_BUTTON (widget)),
+ event->device,
&column->drag_x,
&column->drag_y,
NULL);
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);
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,
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;
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 */
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 */
* @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
**/
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);
}
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;
{
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 (gtk_widget_get_style (GTK_WIDGET (tree_column->tree_view)),
- window,
+ cr,
cell_state,
- cell_area,
tree_column->tree_view,
"treeview",
focus_rectangle.x,
{
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