callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented GtkWidget::focus. Makes grid views keyboard-navigatable and

Browse Source 
2003-03-26  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimpcontainergridview.c: implemented GtkWidget::focus.
	Makes grid views keyboard-navigatable and fixes bug #95120.
This commit is contained in:
Sven Neumann
2003-03-26 15:28:17 +00:00
committed by Sven Neumann
parent af37e71b80
commit 1eb9cc26f8
2 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-03-26 Sven Neumann <sven@gimp.org>
* app/widgets/gimpcontainergridview.c: implemented GtkWidget::focus.
Makes grid views keyboard-navigatable and fixes bug #95120.
2003-03-26 Michael Natterer <mitch@gimp.org> 2003-03-26 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcontainerview.[ch]: added the scrolled_win * app/widgets/gimpcontainerview.[ch]: added the scrolled_win

67
app/widgets/gimpcontainergridview.c
View File

@ -43,6 +43,9 @@
static void gimp_container_grid_view_class_init (GimpContainerGridViewClass *klass); static void gimp_container_grid_view_class_init (GimpContainerGridViewClass *klass);
static void gimp_container_grid_view_init (GimpContainerGridView *panel); static void gimp_container_grid_view_init (GimpContainerGridView *panel);
static gboolean gimp_container_grid_view_focus (GtkWidget *widget,
GtkDirectionType direction);
static gpointer gimp_container_grid_view_insert_item (GimpContainerView *view, static gpointer gimp_container_grid_view_insert_item (GimpContainerView *view,
GimpViewable *viewable, GimpViewable *viewable,
gint index); gint index);
@ -112,11 +115,15 @@ static void
gimp_container_grid_view_class_init (GimpContainerGridViewClass *klass) gimp_container_grid_view_class_init (GimpContainerGridViewClass *klass)
{ {
GimpContainerViewClass *container_view_class; GimpContainerViewClass *container_view_class;
GtkWidgetClass *widget_class;
container_view_class = GIMP_CONTAINER_VIEW_CLASS (klass); container_view_class = GIMP_CONTAINER_VIEW_CLASS (klass);
widget_class = GTK_WIDGET_CLASS (klass);
parent_class = g_type_class_peek_parent (klass); parent_class = g_type_class_peek_parent (klass);
widget_class->focus = gimp_container_grid_view_focus;
container_view_class->insert_item = gimp_container_grid_view_insert_item; container_view_class->insert_item = gimp_container_grid_view_insert_item;
container_view_class->remove_item = gimp_container_grid_view_remove_item; container_view_class->remove_item = gimp_container_grid_view_remove_item;
container_view_class->reorder_item = gimp_container_grid_view_reorder_item; container_view_class->reorder_item = gimp_container_grid_view_reorder_item;
@ -164,7 +171,7 @@ gimp_container_grid_view_init (GimpContainerGridView *grid_view)
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW
(view->scrolled_win))); (view->scrolled_win)));
GTK_WIDGET_SET_FLAGS (grid_view->wrap_box->parent, GTK_CAN_FOCUS); GTK_WIDGET_SET_FLAGS (grid_view, GTK_CAN_FOCUS);
} }
GtkWidget * GtkWidget *
@ -206,6 +213,61 @@ gimp_container_grid_view_new (GimpContainer *container,
return GTK_WIDGET (grid_view); return GTK_WIDGET (grid_view);
} }
static gboolean
gimp_container_grid_view_focus (GtkWidget *widget,
GtkDirectionType direction)
{
GimpContainerGridView *grid_view;
GimpContainer *container;
GimpPreview *preview;
GimpViewable *item;
gint index;
if (GTK_WIDGET_CAN_FOCUS (widget) && !GTK_WIDGET_HAS_FOCUS (widget))
{
gtk_widget_grab_focus (GTK_WIDGET (widget));
return TRUE;
}
grid_view = GIMP_CONTAINER_GRID_VIEW (widget);
preview = g_object_get_data (G_OBJECT (grid_view), "last_selected_item");
if (!preview)
return FALSE;
container = GIMP_CONTAINER_VIEW (widget)->container;
index = gimp_container_get_child_index (container,
GIMP_OBJECT (preview->viewable));
switch (direction)
{
case GTK_DIR_TAB_FORWARD:
case GTK_DIR_TAB_BACKWARD:
return FALSE;
case GTK_DIR_UP:
index -= grid_view->columns;
break;
case GTK_DIR_DOWN:
index += grid_view->columns;
break;
case GTK_DIR_LEFT:
index--;
break;
case GTK_DIR_RIGHT:
index++;
break;
}
item = (GimpViewable *) gimp_container_get_child_by_index (container, index);
if (item)
gimp_container_view_item_selected (GIMP_CONTAINER_VIEW (widget), item);
return TRUE;
}
static gpointer static gpointer
gimp_container_grid_view_insert_item (GimpContainerView *view, gimp_container_grid_view_insert_item (GimpContainerView *view,
GimpViewable *viewable, GimpViewable *viewable,
@ -333,6 +395,9 @@ gimp_container_grid_view_item_selected (GtkWidget *widget,
GdkModifierType state, GdkModifierType state,
gpointer data) gpointer data)
{ {
if (GTK_WIDGET_CAN_FOCUS (data) && !GTK_WIDGET_HAS_FOCUS (data))
gtk_widget_grab_focus (GTK_WIDGET (data));
gimp_container_view_item_selected (GIMP_CONTAINER_VIEW (data), gimp_container_view_item_selected (GIMP_CONTAINER_VIEW (data),
GIMP_PREVIEW (widget)->viewable); GIMP_PREVIEW (widget)->viewable);
} }