#undef DEBUG_ICON_VIEW
#define SCROLL_EDGE_SIZE 15
-#define ITEM_PADDING 6
#define GTK_ICON_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ICON_VIEW, GtkIconViewPrivate))
gint row_spacing;
gint column_spacing;
gint margin;
+ gint item_padding;
gint text_column;
gint markup_column;
gint tooltip_column;
- guint draw_focus : 1;
-
/* Drag-and-drop. */
GdkModifierType start_button_mask;
gint pressed_button;
guint empty_view_drop :1;
guint ctrl_pressed : 1;
- guint shift_pressed : 1;
+ guint shift_pressed : 1;
+
+ guint draw_focus : 1;
};
/* Signals */
PROP_COLUMN_SPACING,
PROP_MARGIN,
PROP_REORDERABLE,
- PROP_TOOLTIP_COLUMN
+ PROP_TOOLTIP_COLUMN,
+ PROP_ITEM_PADDING
};
/* GObject vfuncs */
0, G_MAXINT, 6,
GTK_PARAM_READWRITE));
-
/**
* GtkIconView:orientation:
*
-1,
GTK_PARAM_READWRITE));
+ /**
+ * GtkIconView:item-padding:
+ *
+ * The item-padding property specifies the padding around each
+ * of the icon view's item.
+ *
+ * Since: 2.18
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_ITEM_PADDING,
+ g_param_spec_int ("item-padding",
+ P_("Item Padding"),
+ P_("Padding around icon view items"),
+ 0, G_MAXINT, 6,
+ GTK_PARAM_READWRITE));
+
/* Style properties */
G_TYPE_NONE, 2,
GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+ /**
+ * GtkIconView::item-activated:
+ * @iconview: the object on which the signal is emitted
+ * @path: the #GtkTreePath for the activated item
+ *
+ * The ::item-activated signal is emitted when the method
+ * gtk_icon_view_item_activated() is called or the user double
+ * clicks an item. It is also emitted when a non-editable item
+ * is selected and one of the keys: Space, Return or Enter is
+ * pressed.
+ */
icon_view_signals[ITEM_ACTIVATED] =
g_signal_new (I_("item-activated"),
G_TYPE_FROM_CLASS (gobject_class),
G_TYPE_NONE, 1,
GTK_TYPE_TREE_PATH);
+ /**
+ * GtkIconView::selection-changed:
+ * @iconview: the object on which the signal is emitted
+ *
+ * The ::selection-changed signal is emitted when the selection
+ * (i.e. the set of selected items) changes.
+ */
icon_view_signals[SELECTION_CHANGED] =
g_signal_new (I_("selection-changed"),
G_TYPE_FROM_CLASS (gobject_class),
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ /**
+ * GtkIconView::select-all:
+ * @iconview: the object on which the signal is emitted
+ *
+ * A <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user selects all items.
+ *
+ * Applications should not connect to it, but may emit it with
+ * g_signal_emit_by_name() if they need to control selection
+ * programmatically.
+ *
+ * The default binding for this signal is Ctrl-a.
+ */
icon_view_signals[SELECT_ALL] =
g_signal_new (I_("select-all"),
G_TYPE_FROM_CLASS (gobject_class),
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ /**
+ * GtkIconView::unselect-all:
+ * @iconview: the object on which the signal is emitted
+ *
+ * A <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user unselects all items.
+ *
+ * Applications should not connect to it, but may emit it with
+ * g_signal_emit_by_name() if they need to control selection
+ * programmatically.
+ *
+ * The default binding for this signal is Ctrl-Shift-a.
+ */
icon_view_signals[UNSELECT_ALL] =
g_signal_new (I_("unselect-all"),
G_TYPE_FROM_CLASS (gobject_class),
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ /**
+ * GtkIconView::select-cursor-item:
+ * @iconview: the object on which the signal is emitted
+ *
+ * A <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user selects the item that is currently
+ * focused.
+ *
+ * Applications should not connect to it, but may emit it with
+ * g_signal_emit_by_name() if they need to control selection
+ * programmatically.
+ *
+ * There is no default binding for this signal.
+ */
icon_view_signals[SELECT_CURSOR_ITEM] =
g_signal_new (I_("select-cursor-item"),
G_TYPE_FROM_CLASS (gobject_class),
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ /**
+ * GtkIconView::toggle-cursor-item:
+ * @iconview: the object on which the signal is emitted
+ *
+ * A <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user toggles whether the currently
+ * focused item is selected or not. The exact effect of this
+ * depend on the selection mode.
+ *
+ * Applications should not connect to it, but may emit it with
+ * g_signal_emit_by_name() if they need to control selection
+ * programmatically.
+ *
+ * There is no default binding for this signal is Ctrl-Space.
+ */
icon_view_signals[TOGGLE_CURSOR_ITEM] =
g_signal_new (I_("toggle-cursor-item"),
G_TYPE_FROM_CLASS (gobject_class),
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ /**
+ * GtkIconView::activate-cursor-item:
+ * @iconview: the object on which the signal is emitted
+ *
+ * A <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user activates the currently
+ * focused item.
+ *
+ * Applications should not connect to it, but may emit it with
+ * g_signal_emit_by_name() if they need to control activation
+ * programmatically.
+ *
+ * The default bindings for this signal are Space, Return and Enter.
+ */
icon_view_signals[ACTIVATE_CURSOR_ITEM] =
g_signal_new (I_("activate-cursor-item"),
G_TYPE_FROM_CLASS (gobject_class),
_gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
+ /**
+ * GtkIconView::move-cursor:
+ * @iconview: the object which received the signal
+ * @step: the granularity of the move, as a #GtkMovementStep
+ * @count: the number of @step units to move
+ *
+ * The ::move-cursor signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user initiates a cursor movement.
+ *
+ * Applications should not connect to it, but may emit it with
+ * g_signal_emit_by_name() if they need to control the cursor
+ * programmatically.
+ *
+ * The default bindings for this signal include
+ * <itemizedlist>
+ * <listitem>Arrow keys which move by individual steps</listitem>
+ * <listitem>Home/End keys which move to the first/last item</listitem>
+ * <listitem>PageUp/PageDown which move by "pages"</listitem>
+ * </itemizedlist>
+ *
+ * All of these will extend the selection when combined with
+ * the Shift modifier.
+ */
icon_view_signals[MOVE_CURSOR] =
g_signal_new (I_("move-cursor"),
G_TYPE_FROM_CLASS (gobject_class),
icon_view->priv->pixbuf_cell = -1;
icon_view->priv->tooltip_column = -1;
- GTK_WIDGET_SET_FLAGS (icon_view, GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (GTK_WIDGET (icon_view), TRUE);
gtk_icon_view_set_adjustments (icon_view, NULL, NULL);
icon_view->priv->row_spacing = 6;
icon_view->priv->column_spacing = 6;
icon_view->priv->margin = 6;
+ icon_view->priv->item_padding = 6;
icon_view->priv->draw_focus = TRUE;
}
gtk_icon_view_set_tooltip_column (icon_view, g_value_get_int (value));
break;
+ case PROP_ITEM_PADDING:
+ gtk_icon_view_set_item_padding (icon_view, g_value_get_int (value));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
g_value_set_int (value, icon_view->priv->tooltip_column);
break;
+ case PROP_ITEM_PADDING:
+ g_value_set_int (value, icon_view->priv->item_padding);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
icon_view = GTK_ICON_VIEW (widget);
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+ gtk_widget_set_realized (widget, TRUE);
/* Make the main, clipping window */
attributes.window_type = GDK_WINDOW_CHILD;
{
GtkIconView *icon_view = GTK_ICON_VIEW (widget);
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]);
{
GtkIconView *icon_view = GTK_ICON_VIEW (widget);
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]);
tmp_list = tmp_list->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
gtk_widget_size_request (child->widget, &child_requisition);
}
}
/* totally ignore our child's requisition */
if (child->cell < 0)
{
- allocation.x = child->item->x + ITEM_PADDING;
- allocation.y = child->item->y + ITEM_PADDING;
- allocation.width = child->item->width - ITEM_PADDING * 2;
- allocation.height = child->item->height - ITEM_PADDING * 2;
+ allocation.x = child->item->x + icon_view->priv->item_padding;
+ allocation.y = child->item->y + icon_view->priv->item_padding;
+ allocation.width = child->item->width - icon_view->priv->item_padding * 2;
+ allocation.height = child->item->height - icon_view->priv->item_padding * 2;
}
else
{
widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
hadjustment->upper = MAX (allocation->width, icon_view->priv->width);
if (hadjustment->value > hadjustment->upper - hadjustment->page_size)
- gtk_adjustment_set_value (hadjustment, hadjustment->upper - hadjustment->page_size);
+ gtk_adjustment_set_value (hadjustment, MAX (0, hadjustment->upper - hadjustment->page_size));
vadjustment->page_size = allocation->height;
vadjustment->page_increment = allocation->height * 0.9;
vadjustment->upper = MAX (allocation->height, icon_view->priv->height);
if (vadjustment->value > vadjustment->upper - vadjustment->page_size)
- gtk_adjustment_set_value (vadjustment, vadjustment->upper - vadjustment->page_size);
+ gtk_adjustment_set_value (vadjustment, MAX (0, vadjustment->upper - vadjustment->page_size));
- if (GTK_WIDGET_REALIZED (widget) &&
+ if (gtk_widget_get_realized (widget) &&
icon_view->priv->scroll_to_path)
{
GtkTreePath *path;
if (expose->window != icon_view->priv->bin_window)
return FALSE;
+ /* If a layout has been scheduled, do it now so that all
+ * cell view items have valid sizes before we proceed. */
+ if (icon_view->priv->layout_idle_id != 0)
+ gtk_icon_view_layout (icon_view);
+
cr = gdk_cairo_create (icon_view->priv->bin_window);
cairo_set_line_width (cr, 1.);
case GTK_ICON_VIEW_DROP_INTO:
gtk_paint_focus (widget->style,
icon_view->priv->bin_window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
NULL,
widget,
"iconview-drop-indicator",
case GTK_ICON_VIEW_DROP_ABOVE:
gtk_paint_focus (widget->style,
icon_view->priv->bin_window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
NULL,
widget,
"iconview-drop-indicator",
case GTK_ICON_VIEW_DROP_LEFT:
gtk_paint_focus (widget->style,
icon_view->priv->bin_window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
NULL,
widget,
"iconview-drop-indicator",
case GTK_ICON_VIEW_DROP_BELOW:
gtk_paint_focus (widget->style,
icon_view->priv->bin_window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
NULL,
widget,
"iconview-drop-indicator",
case GTK_ICON_VIEW_DROP_RIGHT:
gtk_paint_focus (widget->style,
icon_view->priv->bin_window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
NULL,
widget,
"iconview-drop-indicator",
static gboolean
rubberband_scroll_timeout (gpointer data)
{
- GtkIconView *icon_view = data;
+ GtkIconView *icon_view;
+ gdouble value;
- gtk_adjustment_set_value (icon_view->priv->vadjustment,
- icon_view->priv->vadjustment->value +
- icon_view->priv->scroll_value_diff);
+ icon_view = data;
+
+ value = MIN (icon_view->priv->vadjustment->value +
+ icon_view->priv->scroll_value_diff,
+ icon_view->priv->vadjustment->upper -
+ icon_view->priv->vadjustment->page_size);
+
+ gtk_adjustment_set_value (icon_view->priv->vadjustment, value);
gtk_icon_view_update_rubberband (icon_view);
icon_view->priv->children = g_list_append (icon_view->priv->children, child);
- if (GTK_WIDGET_REALIZED (icon_view))
+ if (gtk_widget_get_realized (GTK_WIDGET (icon_view)))
gtk_widget_set_parent_window (child->widget, icon_view->priv->bin_window);
gtk_widget_set_parent (widget, GTK_WIDGET (icon_view));
info->editing = FALSE;
}
- if (GTK_WIDGET_HAS_FOCUS (editable))
+ if (gtk_widget_has_focus (GTK_WIDGET (editable)))
gtk_widget_grab_focus (GTK_WIDGET (icon_view));
g_signal_handlers_disconnect_by_func (editable,
* gtk_icon_view_set_cursor:
* @icon_view: A #GtkIconView
* @path: A #GtkTreePath
- * @cell: One of the cell renderers of @icon_view, or %NULL
+ * @cell: (allow-none): One of the cell renderers of @icon_view, or %NULL
* @start_editing: %TRUE if the specified cell should start being edited.
*
* Sets the current keyboard focus to be at @path, and selects it. This is
- * useful when you want to focus the user's attention on a particular item.
+ * useful when you want to focus the user's attention on a particular item.
* If @cell is not %NULL, then focus is given to the cell specified by
* it. Additionally, if @start_editing is %TRUE, then editing should be
* started in the specified cell.
/**
* gtk_icon_view_get_cursor:
* @icon_view: A #GtkIconView
- * @path: Return location for the current cursor path, or %NULL
- * @cell: Return location the current focus cell, or %NULL
+ * @path: (allow-none): Return location for the current cursor path, or %NULL
+ * @cell: (allow-none): Return location the current focus cell, or %NULL
*
* Fills in @path and @cell with the current cursor path and cell.
* If the cursor isn't currently set, then *@path will be %NULL.
if (event->window != icon_view->priv->bin_window)
return FALSE;
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
}
else
{
- if (!item->selected)
- {
- gtk_icon_view_unselect_all_internal (icon_view);
-
- item->selected = TRUE;
- gtk_icon_view_queue_draw_item (icon_view, item);
- dirty = TRUE;
- }
+ gtk_icon_view_unselect_all_internal (icon_view);
+
+ item->selected = TRUE;
+ gtk_icon_view_queue_draw_item (icon_view, item);
+ dirty = TRUE;
}
gtk_icon_view_set_cursor_item (icon_view, item, cursor_cell);
icon_view->priv->anchor_item = item;
gtk_icon_view_adjustment_changed (GtkAdjustment *adjustment,
GtkIconView *icon_view)
{
- if (GTK_WIDGET_REALIZED (icon_view))
+ if (gtk_widget_get_realized (GTK_WIDGET (icon_view)))
{
gdk_window_move (icon_view->priv->bin_window,
- icon_view->priv->hadjustment->value,
icon_view->priv->height != widget->requisition.height)
gtk_widget_queue_resize_no_redraw (widget);
- if (GTK_WIDGET_REALIZED (icon_view))
+ if (gtk_widget_get_realized (GTK_WIDGET (icon_view)))
gdk_window_resize (icon_view->priv->bin_window,
MAX (icon_view->priv->width, widget->allocation.width),
MAX (icon_view->priv->height, widget->allocation.height));
if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
cell_area->x = item->box[info->position].x - item->before[info->position];
- cell_area->y = item->y + ITEM_PADDING;
+ cell_area->y = item->y + icon_view->priv->item_padding;
cell_area->width = item->box[info->position].width +
item->before[info->position] + item->after[info->position];
- cell_area->height = item->height - ITEM_PADDING * 2;
+ cell_area->height = item->height - icon_view->priv->item_padding * 2;
}
else
{
- cell_area->x = item->x + ITEM_PADDING;
+ cell_area->x = item->x + icon_view->priv->item_padding;
cell_area->y = item->box[info->position].y - item->before[info->position];
- cell_area->width = item->width - ITEM_PADDING * 2;
+ cell_area->width = item->width - icon_view->priv->item_padding * 2;
cell_area->height = item->box[info->position].height +
item->before[info->position] + item->after[info->position];
}
else
item_width = item->width;
- if (item->width == -1)
- {
- if (item_width > 0)
- wrap_width = item_width - pixbuf_width - icon_view->priv->spacing;
- else
- wrap_width = MAX (2 * pixbuf_width, 50);
- }
- else if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL)
- wrap_width = item_width;
- else
- wrap_width = item_width - pixbuf_width - icon_view->priv->spacing;
+ if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL)
+ wrap_width = item_width;
+ else {
+ if (item->width == -1 && item_width <= 0)
+ wrap_width = MAX (2 * pixbuf_width, 50);
+ else
+ wrap_width = item_width - pixbuf_width - icon_view->priv->spacing;
+ }
- wrap_width -= ITEM_PADDING * 2;
+ wrap_width -= icon_view->priv->item_padding * 2;
g_object_set (text_info->cell, "wrap-width", wrap_width, NULL);
g_object_set (text_info->cell, "width", wrap_width, NULL);
}
}
- item->width += ITEM_PADDING * 2;
- item->height += ITEM_PADDING * 2;
+ item->width += icon_view->priv->item_padding * 2;
+ item->height += icon_view->priv->item_padding * 2;
}
static void
item->height += max_height[i] + (i > 0 ? spacing : 0);
}
- cell_area.x = item->x + ITEM_PADDING;
- cell_area.y = item->y + ITEM_PADDING;
+ cell_area.x = item->x + icon_view->priv->item_padding;
+ cell_area.y = item->y + icon_view->priv->item_padding;
for (k = 0; k < 2; k++)
for (l = icon_view->priv->cell_list, i = 0; l; l = l->next, i++)
if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
- /* We should not subtract ITEM_PADDING from item->height,
+ /* We should not subtract icon_view->priv->item_padding from item->height,
* because item->height is recalculated above using
* max_height which does not contain item padding.
*/
/* item->width is not recalculated and thus needs to be
* corrected for the padding.
*/
- cell_area.width = item->width - 2 * ITEM_PADDING;
+ cell_area.width = item->width - 2 * icon_view->priv->item_padding;
cell_area.height = max_height[i];
}
}
else
{
- if (item->box[info->position].width > item->width - ITEM_PADDING * 2)
+ if (item->box[info->position].width > item->width - icon_view->priv->item_padding * 2)
{
- item->width = item->box[info->position].width + ITEM_PADDING * 2;
+ item->width = item->box[info->position].width + icon_view->priv->item_padding * 2;
cell_area.width = item->width;
}
item->before[info->position] = item->box[info->position].y - cell_area.y;
}
}
- item->height += ITEM_PADDING * 2;
+ item->height += icon_view->priv->item_padding * 2;
}
static void
if (item->selected)
{
flags = GTK_CELL_RENDERER_SELECTED;
- if (GTK_WIDGET_HAS_FOCUS (icon_view))
+ if (gtk_widget_has_focus (GTK_WIDGET (icon_view)))
state = GTK_STATE_SELECTED;
else
state = GTK_STATE_ACTIVE;
}
if (draw_focus &&
- GTK_WIDGET_HAS_FOCUS (icon_view) &&
+ gtk_widget_has_focus (GTK_WIDGET (icon_view)) &&
item == icon_view->priv->cursor_item)
{
for (l = icon_view->priv->cell_list, i = 0; l; l = l->next, i++)
GList *items, *l;
GdkRectangle box;
+ if (cell_at_pos)
+ *cell_at_pos = NULL;
+
for (items = icon_view->priv->items; items; items = items->next)
{
GtkIconViewItem *item = items->data;
for (l = icon_view->priv->cell_list; l; l = l->next)
{
GtkIconViewCellInfo *info = (GtkIconViewCellInfo *)l->data;
-
+
if (!info->cell->visible)
continue;
-
+
gtk_icon_view_get_cell_box (icon_view, item, info, &box);
-
+
if ((x >= box.x && x <= box.x + box.width &&
y >= box.y && y <= box.y + box.height) ||
(x >= box.x &&
{
if (cell_at_pos)
*cell_at_pos = info;
-
+
return item;
}
}
if (only_in_cell)
return NULL;
-
- if (cell_at_pos)
- *cell_at_pos = NULL;
}
return item;
step == GTK_MOVEMENT_PAGES ||
step == GTK_MOVEMENT_BUFFER_ENDS, FALSE);
- if (!GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (icon_view)))
+ if (!gtk_widget_has_focus (GTK_WIDGET (icon_view)))
return FALSE;
gtk_icon_view_stop_editing (icon_view, FALSE);
gboolean dirty = FALSE;
gint step;
- if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+ if (!gtk_widget_has_focus (GTK_WIDGET (icon_view)))
return;
if (!icon_view->priv->cursor_item)
GtkIconViewItem *item;
gboolean dirty = FALSE;
- if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+ if (!gtk_widget_has_focus (GTK_WIDGET (icon_view)))
return;
if (!icon_view->priv->cursor_item)
gboolean dirty = FALSE;
gint step;
- if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+ if (!gtk_widget_has_focus (GTK_WIDGET (icon_view)))
return;
if (!icon_view->priv->cursor_item)
GList *list;
gboolean dirty = FALSE;
- if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+ if (!gtk_widget_has_focus (GTK_WIDGET (icon_view)))
return;
if (count < 0)
item = g_list_nth_data (icon_view->priv->items,
gtk_tree_path_get_indices(path)[0]);
- if (!GTK_WIDGET_REALIZED (icon_view) || !item || item->width < 0)
+ if (!item || item->width < 0 ||
+ !gtk_widget_get_realized (GTK_WIDGET (icon_view)))
{
if (icon_view->priv->scroll_to_path)
gtk_tree_row_reference_free (icon_view->priv->scroll_to_path);
{
gint x, y;
gint focus_width;
- gfloat offset;
+ gfloat offset, value;
gtk_widget_style_get (GTK_WIDGET (icon_view),
"focus-line-width", &focus_width,
offset = y + item->y - focus_width -
row_align * (GTK_WIDGET (icon_view)->allocation.height - item->height);
-
- gtk_adjustment_set_value (icon_view->priv->vadjustment,
- icon_view->priv->vadjustment->value + offset);
+ value = CLAMP (icon_view->priv->vadjustment->value + offset,
+ icon_view->priv->vadjustment->lower,
+ icon_view->priv->vadjustment->upper - icon_view->priv->vadjustment->page_size);
+ gtk_adjustment_set_value (icon_view->priv->vadjustment, value);
offset = x + item->x - focus_width -
col_align * (GTK_WIDGET (icon_view)->allocation.width - item->width);
-
- gtk_adjustment_set_value (icon_view->priv->hadjustment,
- icon_view->priv->hadjustment->value + offset);
+ value = CLAMP (icon_view->priv->hadjustment->value + offset,
+ icon_view->priv->hadjustment->lower,
+ icon_view->priv->hadjustment->upper - icon_view->priv->hadjustment->page_size);
+ gtk_adjustment_set_value (icon_view->priv->hadjustment, value);
gtk_adjustment_changed (icon_view->priv->hadjustment);
gtk_adjustment_changed (icon_view->priv->vadjustment);
* @icon_view: A #GtkIconView.
* @x: The x position to be identified
* @y: The y position to be identified
- * @path: Return location for the path, or %NULL
+ * @path: (allow-none): Return location for the path, or %NULL
* @cell: Return location for the renderer responsible for the cell
* at (@x, @y), or %NULL
*
* @icon_view: a #GtkIconView
* @tooltip: a #GtkTooltip
* @path: a #GtkTreePath
- * @cell: a #GtkCellRenderer or %NULL
+ * @cell: (allow-none): a #GtkCellRenderer or %NULL
*
* Sets the tip area of @tooltip to the area which @cell occupies in
* the item pointed to by @path. See also gtk_tooltip_set_tip_area().
* @x: the x coordinate (relative to widget coordinates)
* @y: the y coordinate (relative to widget coordinates)
* @keyboard_tip: whether this is a keyboard tooltip or not
- * @model: a pointer to receive a #GtkTreeModel or %NULL
- * @path: a pointer to receive a #GtkTreePath or %NULL
- * @iter: a pointer to receive a #GtkTreeIter or %NULL
+ * @model: (allow-none): a pointer to receive a #GtkTreeModel or %NULL
+ * @path: (allow-none): a pointer to receive a #GtkTreePath or %NULL
+ * @iter: (allow-none): a pointer to receive a #GtkTreeIter or %NULL
*
* This function is supposed to be used in a #GtkWidget::query-tooltip
* signal handler for #GtkIconView. The @x, @y and @keyboard_tip values
/**
* gtk_icon_view_get_visible_range:
* @icon_view: A #GtkIconView
- * @start_path: Return location for start of region, or %NULL
- * @end_path: Return location for end of region, or %NULL
+ * @start_path: (allow-none): Return location for start of region, or %NULL
+ * @end_path: (allow-none): Return location for end of region, or %NULL
*
* Sets @start_path and @end_path to be the first and last visible path.
* Note that there may be invisible paths in between.
/**
* gtk_icon_view_set_model:
* @icon_view: A #GtkIconView.
- * @model: The model.
+ * @model: (allow-none): The model.
*
- * Sets the model for a #GtkIconView.
- * If the @icon_view already has a model set, it will remove
+ * Sets the model for a #GtkIconView.
+ * If the @icon_view already has a model set, it will remove
* it before setting the new model. If @model is %NULL, then
* it will unset the old model.
*
g_object_notify (G_OBJECT (icon_view), "model");
- if (GTK_WIDGET_REALIZED (icon_view))
+ if (gtk_widget_get_realized (GTK_WIDGET (icon_view)))
gtk_widget_queue_resize (GTK_WIDGET (icon_view));
}
*
* To free the return value, use:
* |[
- * g_list_foreach (list, gtk_tree_path_free, NULL);
+ * g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL);
* g_list_free (list);
* ]|
*
- * Return value: A #GList containing a #GtkTreePath for each selected row.
+ * Return value: (element-type GtkTreePath) (transfer full): A #GList containing a #GtkTreePath for each selected row.
*
* Since: 2.6
**/
return icon_view->priv->margin;
}
+/**
+ * gtk_icon_view_set_item_padding:
+ * @icon_view: a #GtkIconView
+ * @item_padding: the item padding
+ *
+ * Sets the #GtkIconView:item-padding property which specifies the padding
+ * around each of the icon view's items.
+ *
+ * Since: 2.18
+ */
+void
+gtk_icon_view_set_item_padding (GtkIconView *icon_view,
+ gint item_padding)
+{
+ g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+
+ if (icon_view->priv->item_padding != item_padding)
+ {
+ icon_view->priv->item_padding = item_padding;
+
+ gtk_icon_view_stop_editing (icon_view, TRUE);
+ gtk_icon_view_invalidate_sizes (icon_view);
+ gtk_icon_view_queue_layout (icon_view);
+
+ g_object_notify (G_OBJECT (icon_view), "item-padding");
+ }
+}
+
+/**
+ * gtk_icon_view_get_item_padding:
+ * @icon_view: a #GtkIconView
+ *
+ * Returns the value of the ::item-padding property.
+ *
+ * Return value: the padding around items
+ *
+ * Since: 2.18
+ */
+gint
+gtk_icon_view_get_item_padding (GtkIconView *icon_view)
+{
+ g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+
+ return icon_view->priv->item_padding;
+}
/* Get/set whether drag_motion requested the drag data and
* drag_data_received should thus not actually insert the data,
{
gint px, py, x, y, width, height;
gint hoffset, voffset;
+ gfloat value;
gdk_window_get_pointer (GTK_WIDGET (icon_view)->window, &px, &py, NULL);
gdk_window_get_geometry (GTK_WIDGET (icon_view)->window, &x, &y, &width, &height, NULL);
hoffset = MAX (px - (x + width - 2 * SCROLL_EDGE_SIZE), 0);
if (voffset != 0)
- gtk_adjustment_set_value (icon_view->priv->vadjustment,
- icon_view->priv->vadjustment->value + voffset);
-
+ {
+ value = CLAMP (icon_view->priv->vadjustment->value + voffset,
+ icon_view->priv->vadjustment->lower,
+ icon_view->priv->vadjustment->upper - icon_view->priv->vadjustment->page_size);
+ gtk_adjustment_set_value (icon_view->priv->vadjustment, value);
+ }
if (hoffset != 0)
- gtk_adjustment_set_value (icon_view->priv->hadjustment,
- icon_view->priv->hadjustment->value + hoffset);
+ {
+ value = CLAMP (icon_view->priv->hadjustment->value + hoffset,
+ icon_view->priv->hadjustment->lower,
+ icon_view->priv->hadjustment->upper - icon_view->priv->hadjustment->page_size);
+ gtk_adjustment_set_value (icon_view->priv->hadjustment, value);
+ }
}
* @n_targets: the number of items in @targets
* @actions: the bitmask of possible actions for a drag from this
* widget
- *
- * Turns @icon_view into a drag source for automatic DND.
+ *
+ * Turns @icon_view into a drag source for automatic DND. Calling this
+ * method sets #GtkIconView:reorderable to %FALSE.
*
* Since: 2.8
**/
* @n_targets: the number of items in @targets
* @actions: the bitmask of possible actions for a drag to this
* widget
- *
- * Turns @icon_view into a drop destination for automatic DND.
+ *
+ * Turns @icon_view into a drop destination for automatic DND. Calling this
+ * method sets #GtkIconView:reorderable to %FALSE.
*
* Since: 2.8
**/
* gtk_icon_view_unset_model_drag_source:
* @icon_view: a #GtkIconView
*
- * Undoes the effect of gtk_icon_view_enable_model_drag_source().
+ * Undoes the effect of gtk_icon_view_enable_model_drag_source(). Calling this
+ * method sets #GtkIconView:reorderable to %FALSE.
*
* Since: 2.8
**/
* gtk_icon_view_unset_model_drag_dest:
* @icon_view: a #GtkIconView
*
- * Undoes the effect of gtk_icon_view_enable_model_drag_dest().
+ * Undoes the effect of gtk_icon_view_enable_model_drag_dest(). Calling this
+ * method sets #GtkIconView:reorderable to %FALSE.
*
* Since: 2.8
**/
/**
* gtk_icon_view_set_drag_dest_item:
* @icon_view: a #GtkIconView
- * @path: The path of the item to highlight, or %NULL.
+ * @path: (allow-none): The path of the item to highlight, or %NULL.
* @pos: Specifies where to drop, relative to the item
- *
+ *
* Sets the item that is highlighted for feedback.
*
* Since: 2.8
/* special case a drop on an empty model */
icon_view->priv->empty_view_drop = FALSE;
- if (pos == GTK_TREE_VIEW_DROP_BEFORE && path
+ if (pos == GTK_ICON_VIEW_DROP_ABOVE && path
&& gtk_tree_path_get_depth (path) == 1
&& gtk_tree_path_get_indices (path)[0] == 0)
{
/**
* gtk_icon_view_get_drag_dest_item:
* @icon_view: a #GtkIconView
- * @path: Return location for the path of the highlighted item, or %NULL.
- * @pos: Return location for the drop position, or %NULL
+ * @path: (allow-none): Return location for the path of the highlighted item, or %NULL.
+ * @pos: (allow-none): Return location for the drop position, or %NULL
*
* Gets information about the item that is highlighted for feedback.
*
* @icon_view: a #GtkIconView
* @drag_x: the position to determine the destination item for
* @drag_y: the position to determine the destination item for
- * @path: Return location for the path of the item, or %NULL.
- * @pos: Return location for the drop position, or %NULL
+ * @path: (allow-none): Return location for the path of the item, or %NULL.
+ * @pos: (allow-none): Return location for the drop position, or %NULL
*
* Determines the destination item for a given position.
*
widget = GTK_WIDGET (icon_view);
- if (!GTK_WIDGET_REALIZED (widget))
+ if (!gtk_widget_get_realized (widget))
return NULL;
index = gtk_tree_path_get_indices (path)[0];
cairo_set_line_width (cr, 1.);
gdk_cairo_set_source_color
- (cr, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ (cr, &widget->style->base[gtk_widget_get_state (widget)]);
cairo_rectangle (cr, 0, 0, item->width + 2, item->height + 2);
cairo_fill (cr);
* #GtkTreeStore and #GtkListStore support these. If @reorderable is %TRUE, then
* the user can reorder the model by dragging and dropping rows. The
* developer can listen to these changes by connecting to the model's
- * row_inserted and row_deleted signals.
+ * row_inserted and row_deleted signals. The reordering is implemented by setting up
+ * the icon view as a drag source and destination. Therefore, drag and
+ * drop can not be used in a reorderable view for any other purpose.
*
* This function does not give you any degree of control over the order -- any
* reordering is allowed. If more control is needed, you should probably
item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (image);
g_free (item->image_description);
- item->image_description = g_strdup (item->image_description);
+ item->image_description = g_strdup (description);
return TRUE;
}
gtk_widget_grab_focus (item->widget);
gtk_icon_view_set_cursor_item (GTK_ICON_VIEW (item->widget), item->item, -1);
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item->widget));
- if (GTK_WIDGET_TOPLEVEL (toplevel))
+ if (gtk_widget_is_toplevel (toplevel))
gtk_window_present (GTK_WINDOW (toplevel));
return TRUE;
NULL /* value table */
};
- static const GInterfaceInfo atk_component_info =
+ const GInterfaceInfo atk_component_info =
{
(GInterfaceInitFunc) atk_component_item_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
- static const GInterfaceInfo atk_action_info =
+ const GInterfaceInfo atk_action_info =
{
(GInterfaceInitFunc) atk_action_item_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
- static const GInterfaceInfo atk_image_info =
+ const GInterfaceInfo atk_image_info =
{
(GInterfaceInitFunc) atk_image_item_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
- static const GInterfaceInfo atk_text_info =
+ const GInterfaceInfo atk_text_info =
{
(GInterfaceInitFunc) atk_text_item_interface_init,
(GInterfaceFinalizeFunc) NULL,
GtkIconViewItem *item;
GtkIconViewAccessible *a11y_view;
GtkIconViewItemAccessible *a11y_item;
- gchar *name, *text;
+ const gchar *name;
+ gchar *text;
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
a11y_view = GTK_ICON_VIEW_ACCESSIBLE (atk_obj);
index = gtk_tree_path_get_indices(path)[0];
- a11y_item = gtk_icon_view_accessible_find_child (atk_obj, index);
+ a11y_item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (
+ gtk_icon_view_accessible_find_child (atk_obj, index));
- widget = GTK_ACCESSIBLE (atk_obj)->widget;
- icon_view = GTK_ICON_VIEW (widget);
- item = a11y_item->item;
+ if (a11y_item)
+ {
+ widget = GTK_ACCESSIBLE (atk_obj)->widget;
+ icon_view = GTK_ICON_VIEW (widget);
+ item = a11y_item->item;
- name = gtk_icon_view_item_accessible_get_name (ATK_OBJECT (a11y_item));
+ name = gtk_icon_view_item_accessible_get_name (ATK_OBJECT (a11y_item));
- if (!name || strcmp (name, "") == 0)
- {
- gtk_icon_view_set_cell_data (icon_view, item);
- text = get_text (icon_view, item);
- if (text)
+ if (!name || strcmp (name, "") == 0)
{
- gtk_text_buffer_set_text (a11y_item->text_buffer, text, -1);
- g_free (text);
+ gtk_icon_view_set_cell_data (icon_view, item);
+ text = get_text (icon_view, item);
+ if (text)
+ {
+ gtk_text_buffer_set_text (a11y_item->text_buffer, text, -1);
+ g_free (text);
+ }
}
}
if (!type)
{
- static GTypeInfo tinfo =
+ GTypeInfo tinfo =
{
0, /* class size */
(GBaseInitFunc) NULL, /* base init */
(GInstanceInitFunc) NULL, /* instance init */
NULL /* value table */
};
- static const GInterfaceInfo atk_component_info =
+ const GInterfaceInfo atk_component_info =
{
(GInterfaceInitFunc) atk_component_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
- static const GInterfaceInfo atk_selection_info =
+ const GInterfaceInfo atk_selection_info =
{
(GInterfaceInitFunc) gtk_icon_view_accessible_selection_interface_init,
(GInterfaceFinalizeFunc) NULL,
projects / ~andy / gtk / blobdiff