PROP_MODEL,
PROP_HADJUSTMENT,
PROP_VADJUSTMENT,
+ PROP_HSCROLL_POLICY,
+ PROP_VSCROLL_POLICY,
PROP_HEADERS_VISIBLE,
PROP_HEADERS_CLICKABLE,
PROP_REORDERABLE,
GtkRequisition *requisition);
static void pspp_sheet_view_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static gboolean pspp_sheet_view_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gboolean pspp_sheet_view_draw (GtkWidget *widget,
+ cairo_t *cr);
static gboolean pspp_sheet_view_key_press (GtkWidget *widget,
GdkEventKey *event);
static gboolean pspp_sheet_view_key_release (GtkWidget *widget,
static void invalidate_empty_focus (PsppSheetView *tree_view);
/* Internal functions */
+static GtkAdjustment *pspp_sheet_view_do_get_hadjustment (PsppSheetView *);
+static GtkAdjustment *pspp_sheet_view_do_get_vadjustment (PsppSheetView *);
+static void pspp_sheet_view_do_set_hadjustment (PsppSheetView *tree_view,
+ GtkAdjustment *adjustment);
+static void pspp_sheet_view_do_set_vadjustment (PsppSheetView *tree_view,
+ GtkAdjustment *adjustment);
static void pspp_sheet_view_add_move_binding (GtkBindingSet *binding_set,
guint keyval,
guint modmask,
G_DEFINE_TYPE_WITH_CODE (PsppSheetView, pspp_sheet_view, GTK_TYPE_CONTAINER,
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
- pspp_sheet_view_buildable_init))
+ pspp_sheet_view_buildable_init)
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL))
+
+static void
+pspp_sheet_view_get_preferred_width (GtkWidget *widget,
+ gint *minimal_width,
+ gint *natural_width)
+{
+ GtkRequisition requisition;
+
+ pspp_sheet_view_size_request (widget, &requisition);
+
+ *minimal_width = *natural_width = requisition.width;
+}
+
+static void
+pspp_sheet_view_get_preferred_height (GtkWidget *widget,
+ gint *minimal_height,
+ gint *natural_height)
+{
+ GtkRequisition requisition;
+
+ pspp_sheet_view_size_request (widget, &requisition);
+
+ *minimal_height = *natural_height = requisition.height;
+}
static void
pspp_sheet_view_class_init (PsppSheetViewClass *class)
widget_class->map = pspp_sheet_view_map;
widget_class->realize = pspp_sheet_view_realize;
widget_class->unrealize = pspp_sheet_view_unrealize;
- widget_class->size_request = pspp_sheet_view_size_request;
+ widget_class->get_preferred_width = pspp_sheet_view_get_preferred_width;
+ widget_class->get_preferred_height = pspp_sheet_view_get_preferred_height;
widget_class->size_allocate = pspp_sheet_view_size_allocate;
widget_class->button_press_event = pspp_sheet_view_button_press;
widget_class->button_release_event = pspp_sheet_view_button_release;
widget_class->grab_broken_event = pspp_sheet_view_grab_broken;
/*widget_class->configure_event = pspp_sheet_view_configure;*/
widget_class->motion_notify_event = pspp_sheet_view_motion;
- widget_class->expose_event = pspp_sheet_view_expose;
+ widget_class->draw = pspp_sheet_view_draw;
widget_class->key_press_event = pspp_sheet_view_key_press;
widget_class->key_release_event = pspp_sheet_view_key_release;
widget_class->enter_notify_event = pspp_sheet_view_enter_notify;
GTK_TYPE_TREE_MODEL,
GTK_PARAM_READWRITE));
- g_object_class_install_property (o_class,
- PROP_HADJUSTMENT,
- g_param_spec_object ("hadjustment",
- P_("Horizontal Adjustment"),
- P_("Horizontal Adjustment for the widget"),
- GTK_TYPE_ADJUSTMENT,
- GTK_PARAM_READWRITE));
-
- g_object_class_install_property (o_class,
- PROP_VADJUSTMENT,
- g_param_spec_object ("vadjustment",
- P_("Vertical Adjustment"),
- P_("Vertical Adjustment for the widget"),
- GTK_TYPE_ADJUSTMENT,
- GTK_PARAM_READWRITE));
+ g_object_class_override_property (o_class, PROP_HADJUSTMENT, "hadjustment");
+ g_object_class_override_property (o_class, PROP_VADJUSTMENT, "vadjustment");
+ g_object_class_override_property (o_class, PROP_HSCROLL_POLICY, "hscroll-policy");
+ g_object_class_override_property (o_class, PROP_VSCROLL_POLICY, "vscroll-policy");
g_object_class_install_property (o_class,
PROP_HEADERS_VISIBLE,
GTK_PARAM_READABLE));
/* Signals */
+#if GTK3_TRANSITION
/**
* PsppSheetView::set-scroll-adjustments
* @horizontal: the horizontal #GtkAdjustment
G_TYPE_NONE, 2,
GTK_TYPE_ADJUSTMENT,
GTK_TYPE_ADJUSTMENT);
+#endif
/**
* PsppSheetView::row-activated:
tree_view->priv->button_style = NULL;
tree_view->dispose_has_run = FALSE;
+
+ pspp_sheet_view_do_set_vadjustment (tree_view, NULL);
+ pspp_sheet_view_do_set_hadjustment (tree_view, NULL);
}
\f
pspp_sheet_view_set_model (tree_view, g_value_get_object (value));
break;
case PROP_HADJUSTMENT:
- pspp_sheet_view_set_hadjustment (tree_view, g_value_get_object (value));
+ pspp_sheet_view_do_set_hadjustment (tree_view, g_value_get_object (value));
break;
case PROP_VADJUSTMENT:
- pspp_sheet_view_set_vadjustment (tree_view, g_value_get_object (value));
+ pspp_sheet_view_do_set_vadjustment (tree_view, g_value_get_object (value));
break;
- case PROP_HEADERS_VISIBLE:
+ case PROP_HSCROLL_POLICY:
+ tree_view->priv->hscroll_policy = g_value_get_enum (value);
+ gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+ break;
+ case PROP_VSCROLL_POLICY:
+ tree_view->priv->vscroll_policy = g_value_get_enum (value);
+ gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+ break;
+ case PROP_HEADERS_VISIBLE:
pspp_sheet_view_set_headers_visible (tree_view, g_value_get_boolean (value));
break;
case PROP_HEADERS_CLICKABLE:
case PROP_VADJUSTMENT:
g_value_set_object (value, tree_view->priv->vadjustment);
break;
+ case PROP_HSCROLL_POLICY:
+ g_value_set_enum (value, tree_view->priv->hscroll_policy);
+ break;
+ case PROP_VSCROLL_POLICY:
+ g_value_set_enum (value, tree_view->priv->vscroll_policy);
+ break;
case PROP_HEADERS_VISIBLE:
g_value_set_boolean (value, pspp_sheet_view_get_headers_visible (tree_view));
break;
pspp_sheet_view_column_size_allocate (column, &col_allocation);
- if (span_intersects (col_allocation.x, col_allocation.width,
- gtk_adjustment_get_value (tree_view->priv->hadjustment),
- allocation.width)
- && gtk_widget_get_realized (widget))
- pspp_sheet_view_column_set_need_button (column, TRUE);
-
if (column->window)
gdk_window_move_resize (column->window,
col_allocation.x + (rtl ? 0 : col_allocation.width) - TREE_VIEW_DRAG_WIDTH/2,
for (list = tree_view->priv->columns; list; list = list->next, i++)
{
PsppSheetViewColumn *column = list->data;
-
- /* We don't want a line for the last column */
- if (i == n_visible_columns - 1)
- break;
+ gint x;
if (! column->visible)
continue;
current_x += column->width;
+ /* Generally the grid lines should fit within the column, but for the
+ last visible column we put it just past the end of the column.
+ (Otherwise horizontal grid lines sometimes stick out by one pixel.) */
+ x = current_x;
+ if (i != n_visible_columns - 1)
+ x--;
+
cairo_set_line_width (cr, 1.0);
cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
- cairo_move_to (cr, current_x - 0.5, min_y);
- cairo_line_to (cr, current_x - 0.5 , max_y - min_y);
-
+ cairo_move_to (cr, x + 0.5, min_y);
+ cairo_line_to (cr, x + 0.5, max_y - min_y);
cairo_stroke (cr);
}
}
* KEEP IN SYNC WITH pspp_sheet_view_create_row_drag_icon()!
* FIXME: It's not...
*/
-static gboolean
-pspp_sheet_view_bin_expose (GtkWidget *widget,
- GdkEventExpose *event)
+static void
+pspp_sheet_view_draw_bin (GtkWidget *widget,
+ cairo_t *cr)
{
PsppSheetView *tree_view = PSPP_SHEET_VIEW (widget);
GtkTreePath *path;
gboolean row_ending_details;
gboolean draw_vgrid_lines, draw_hgrid_lines;
gint min_y, max_y;
- cairo_t *cr = gdk_cairo_create (event->window);
+
GdkRectangle Zarea;
GtkAllocation allocation;
gtk_widget_get_allocation (widget, &allocation);
+ GdkRectangle exposed_rect;
+ gdk_cairo_get_clip_rectangle (cr, &exposed_rect);
+
Zarea.x = 0;
Zarea.y = 0;
- Zarea.width = gdk_window_get_width (event->window);
Zarea.height = allocation.height;
rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
if (tree_view->priv->row_count == 0)
{
draw_empty_focus (tree_view);
- return TRUE;
+ return;
}
#if GTK3_TRANSITION
/* clip event->area to the visible area */
if (Zarea.height < 0.5)
- return TRUE;
+ return;
#endif
validate_visible_area (tree_view);
}
if (node < 0)
- return TRUE;
+ return;
/* find the path for the node */
path = _pspp_sheet_view_find_path ((PsppSheetView *)widget, node);
#if GTK3_TRANSITION
if (gdk_region_rect_in (event->region, &background_area) == GDK_OVERLAP_RECTANGLE_OUT)
+#else
+ if (!gdk_rectangle_intersect (&background_area, &exposed_rect, NULL))
+#endif
{
cell_offset += column->width;
continue;
}
-#endif
+
pspp_sheet_view_column_cell_set_cell_data (column,
tree_view->priv->model,
#endif
}
- if (y_offset + max_height >= Zarea.height - 0.5)
+ if (y_offset + max_height <= Zarea.height - 0.5)
{
#if GTK3_TRANSITION
gdk_draw_line (event->window,
if (row_ending_details)
gtk_paint_focus (gtk_widget_get_style (widget),
- tree_view->priv->bin_window,
+ cr,
gtk_widget_get_state (widget),
- &Zarea,
widget,
(is_first
? (is_last ? "treeview-drop-indicator" : "treeview-drop-indicator-left" )
- focus_line_width + 1);
else
gtk_paint_focus (gtk_widget_get_style (widget),
- tree_view->priv->bin_window,
+ cr,
gtk_widget_get_state (widget),
- &Zarea,
widget,
"treeview-drop-indicator",
0, BACKGROUND_FIRST_PIXEL (tree_view, node)
if (row_ending_details)
gtk_paint_focus (gtk_widget_get_style (widget),
- tree_view->priv->bin_window,
+ cr,
focus_rect_state,
- &Zarea,
widget,
(is_first
? (is_last ? "treeview" : "treeview-left" )
width, tmp_height);
else
gtk_paint_focus (gtk_widget_get_style (widget),
- tree_view->priv->bin_window,
+ cr,
focus_rect_state,
- &Zarea,
widget,
"treeview",
0, tmp_y,
done = TRUE;
/* Sanity Check! */
- TREE_VIEW_INTERNAL_ASSERT (has_next, FALSE);
+ TREE_VIEW_INTERNAL_ASSERT_VOID (has_next);
}
else
goto done;
if (drag_dest_path)
gtk_tree_path_free (drag_dest_path);
- return FALSE;
+ return;
}
+
static gboolean
-pspp_sheet_view_expose (GtkWidget *widget,
- GdkEventExpose *event)
+pspp_sheet_view_draw (GtkWidget *widget,
+ cairo_t *cr)
{
PsppSheetView *tree_view = PSPP_SHEET_VIEW (widget);
- cairo_t *cr = gdk_cairo_create (event->window);
-
- if (event->window == tree_view->priv->bin_window)
+
+ if (gtk_cairo_should_draw_window (cr, tree_view->priv->bin_window))
{
- gboolean retval;
GList *tmp_list;
- retval = pspp_sheet_view_bin_expose (widget, event);
+ cairo_save (cr);
+ gtk_cairo_transform_to_window(cr,widget,tree_view->priv->bin_window);
+ pspp_sheet_view_draw_bin (widget, cr);
+ cairo_restore (cr);
/* We can't just chain up to Container::expose as it will try to send the
* event to the headers, so we handle propagating it to our children
PsppSheetViewChild *child = tmp_list->data;
tmp_list = tmp_list->next;
- gtk_container_propagate_expose (GTK_CONTAINER (tree_view), child->widget, event);
+ gtk_container_propagate_draw (GTK_CONTAINER (tree_view), child->widget, cr);
}
-
- return retval;
}
- else if (event->window == tree_view->priv->header_window)
+ if (gtk_cairo_should_draw_window (cr, tree_view->priv->header_window))
{
gint n_visible_columns;
GList *list;
- gtk_paint_flat_box (gtk_widget_get_style (widget),
- cr,
- GTK_STATE_NORMAL,
- GTK_SHADOW_NONE,
- widget,
- "cell_odd",
- event->area.x,
- event->area.y,
- event->area.width,
- event->area.height);
-
for (list = tree_view->priv->columns; list != NULL; list = list->next)
{
PsppSheetViewColumn *column = list->data;
continue;
if (span_intersects (column->allocation.x, column->allocation.width,
- event->area.x, event->area.width)
+ (int) gtk_adjustment_get_value (tree_view->priv->hadjustment),
+ (int) gtk_widget_get_allocated_width (widget))
&& column->button != NULL)
- gtk_container_propagate_expose (GTK_CONTAINER (tree_view),
- column->button, event);
+ gtk_container_propagate_draw (GTK_CONTAINER (tree_view),
+ column->button, cr);
}
n_visible_columns = 0;
continue;
n_visible_columns ++;
}
+ cairo_save (cr);
+ gtk_cairo_transform_to_window(cr,widget,tree_view->priv->header_window);
pspp_sheet_view_draw_vertical_grid_lines (tree_view,
cr,
n_visible_columns,
- event->area.y,
- event->area.height);
+ 0,
+ TREE_VIEW_HEADER_HEIGHT (tree_view));
+ cairo_restore (cr);
}
- else if (event->window == tree_view->priv->drag_window)
+ if (tree_view->priv->drag_window &&
+ gtk_cairo_should_draw_window (cr, tree_view->priv->drag_window))
{
- gtk_container_propagate_expose (GTK_CONTAINER (tree_view),
- tree_view->priv->drag_column->button,
- event);
+ gtk_container_propagate_draw (GTK_CONTAINER (tree_view),
+ tree_view->priv->drag_column->button,
+ cr);
}
- return TRUE;
+
+ return FALSE;
}
enum
g_return_if_fail (focus_column != NULL);
tree_view->priv->focus_column = focus_column;
- if (!focus_column->button)
- {
- pspp_sheet_view_column_set_need_button (focus_column, TRUE);
- // g_return_if_fail (focus_column->button != NULL);
- if (focus_column->button == NULL)
- return;
- }
if (gtk_container_get_focus_child (GTK_CONTAINER (tree_view)) != focus_column->button)
gtk_widget_grab_focus (focus_column->button);
if (column->visible &&
pspp_sheet_view_column_can_focus (column))
{
- pspp_sheet_view_column_set_need_button (column, TRUE);
if (column->button)
{
pspp_sheet_view_focus_column (tree_view, column,
if (!tree_view->priv->in_top_row_to_dy)
pspp_sheet_view_dy_to_top_row (tree_view);
}
-
- for (list = tree_view->priv->columns; list; list = list->next)
- {
- PsppSheetViewColumn *column = list->data;
- GtkAllocation *col_allocation = &column->allocation;
- GtkAllocation widget_allocation;
- gtk_widget_get_allocation (GTK_WIDGET (tree_view), &widget_allocation);
-
- if (span_intersects (col_allocation->x, col_allocation->width,
- gtk_adjustment_get_value (tree_view->priv->hadjustment),
- widget_allocation.width))
- {
- pspp_sheet_view_column_set_need_button (column, TRUE);
- if (!column->button)
- pspp_sheet_view_column_update_button (column);
- }
- }
}
}
{
g_return_val_if_fail (PSPP_IS_SHEET_VIEW (tree_view), NULL);
- if (tree_view->priv->hadjustment == NULL)
- pspp_sheet_view_set_hadjustment (tree_view, NULL);
+ return pspp_sheet_view_do_get_hadjustment (tree_view);
+}
+static GtkAdjustment *
+pspp_sheet_view_do_get_hadjustment (PsppSheetView *tree_view)
+{
return tree_view->priv->hadjustment;
}
g_object_notify (G_OBJECT (tree_view), "hadjustment");
}
+static void
+pspp_sheet_view_do_set_hadjustment (PsppSheetView *tree_view,
+ GtkAdjustment *adjustment)
+{
+ PsppSheetViewPrivate *priv = tree_view->priv;
+
+ if (adjustment && priv->hadjustment == adjustment)
+ return;
+
+ if (priv->hadjustment != NULL)
+ {
+ g_signal_handlers_disconnect_by_func (priv->hadjustment,
+ pspp_sheet_view_adjustment_changed,
+ tree_view);
+ g_object_unref (priv->hadjustment);
+ }
+
+ if (adjustment == NULL)
+ adjustment = gtk_adjustment_new (0.0, 0.0, 0.0,
+ 0.0, 0.0, 0.0);
+
+ g_signal_connect (adjustment, "value-changed",
+ G_CALLBACK (pspp_sheet_view_adjustment_changed), tree_view);
+ priv->hadjustment = g_object_ref_sink (adjustment);
+ /* FIXME: Adjustment should probably be populated here with fresh values, but
+ * internal details are too complicated for me to decipher right now.
+ */
+ pspp_sheet_view_adjustment_changed (NULL, tree_view);
+
+ g_object_notify (G_OBJECT (tree_view), "hadjustment");
+}
+
/**
* pspp_sheet_view_get_vadjustment:
* @tree_view: A #PsppSheetView
*
* Gets the #GtkAdjustment currently being used for the vertical aspect.
*
- * Return value: A #GtkAdjustment object, or %NULL if none is currently being
- * used.
+ * Return value: (transfer none): A #GtkAdjustment object, or %NULL
+ * if none is currently being used.
+ *
+ * Deprecated: 3.0: Use gtk_scrollable_get_vadjustment()
**/
GtkAdjustment *
pspp_sheet_view_get_vadjustment (PsppSheetView *tree_view)
{
g_return_val_if_fail (PSPP_IS_SHEET_VIEW (tree_view), NULL);
- if (tree_view->priv->vadjustment == NULL)
- pspp_sheet_view_set_vadjustment (tree_view, NULL);
+ return pspp_sheet_view_do_get_vadjustment (tree_view);
+}
+static GtkAdjustment *
+pspp_sheet_view_do_get_vadjustment (PsppSheetView *tree_view)
+{
return tree_view->priv->vadjustment;
}
* @adjustment: (allow-none): The #GtkAdjustment to set, or %NULL
*
* Sets the #GtkAdjustment for the current vertical aspect.
+ *
+ * Deprecated: 3.0: Use gtk_scrollable_set_vadjustment()
**/
void
pspp_sheet_view_set_vadjustment (PsppSheetView *tree_view,
- GtkAdjustment *adjustment)
+ GtkAdjustment *adjustment)
{
g_return_if_fail (PSPP_IS_SHEET_VIEW (tree_view));
+ g_return_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment));
- pspp_sheet_view_set_adjustments (tree_view,
- tree_view->priv->hadjustment,
- adjustment);
+ pspp_sheet_view_do_set_vadjustment (tree_view, adjustment);
+}
+
+static void
+pspp_sheet_view_do_set_vadjustment (PsppSheetView *tree_view,
+ GtkAdjustment *adjustment)
+{
+ PsppSheetViewPrivate *priv = tree_view->priv;
+
+ if (adjustment && priv->vadjustment == adjustment)
+ return;
+ if (priv->vadjustment != NULL)
+ {
+ g_signal_handlers_disconnect_by_func (priv->vadjustment,
+ pspp_sheet_view_adjustment_changed,
+ tree_view);
+ g_object_unref (priv->vadjustment);
+ }
+
+ if (adjustment == NULL)
+ adjustment = gtk_adjustment_new (0.0, 0.0, 0.0,
+ 0.0, 0.0, 0.0);
+
+ g_signal_connect (adjustment, "value-changed",
+ G_CALLBACK (pspp_sheet_view_adjustment_changed), tree_view);
+ priv->vadjustment = g_object_ref_sink (adjustment);
+ /* FIXME: Adjustment should probably be populated here with fresh values, but
+ * internal details are too complicated for me to decipher right now.
+ */
+ pspp_sheet_view_adjustment_changed (NULL, tree_view);
g_object_notify (G_OBJECT (tree_view), "vadjustment");
}
projects / pspp / blobdiff