p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve key handling 

Iteration should be limited to the view.

g_signal_connect_after() did not work as I hoped it would.
This commit is contained in:
Přemysl Eric Janouch 2021-11-13 09:40:10 +01:00
parent 7dba21c6d8
commit 73dd5bf1a0
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fastiv.c
View File

@ -280,6 +280,26 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
on_open(); on_open();
return TRUE; return TRUE;
case GDK_KEY_Tab:
case GDK_KEY_Return:
gtk_stack_set_visible_child(GTK_STACK(g.stack),
gtk_stack_get_visible_child(GTK_STACK(g.stack)) ==
g.view_scroller
? g.browser_scroller
: g.view_scroller);
return TRUE;
}
}
return FALSE;
}
static gboolean
on_key_press_view(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
G_GNUC_UNUSED gpointer data)
{
switch (event->state & gtk_accelerator_get_default_mod_mask()) {
case 0:
switch (event->keyval) {
case GDK_KEY_Left: case GDK_KEY_Left:
case GDK_KEY_Up: case GDK_KEY_Up:
case GDK_KEY_Page_Up: case GDK_KEY_Page_Up:
@ -292,15 +312,6 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
case GDK_KEY_space: case GDK_KEY_space:
on_next(); on_next();
return TRUE; return TRUE;
case GDK_KEY_Tab:
case GDK_KEY_Return:
gtk_stack_set_visible_child(GTK_STACK(g.stack),
gtk_stack_get_visible_child(GTK_STACK(g.stack)) ==
g.view_scroller
? g.browser_scroller
: g.view_scroller);
return TRUE;
} }
} }
return FALSE; return FALSE;
@ -364,6 +375,8 @@ main(int argc, char *argv[])
g.view = g_object_new(FASTIV_TYPE_VIEW, NULL); g.view = g_object_new(FASTIV_TYPE_VIEW, NULL);
gtk_widget_set_vexpand(g.view, TRUE); gtk_widget_set_vexpand(g.view, TRUE);
gtk_widget_set_hexpand(g.view, TRUE); gtk_widget_set_hexpand(g.view, TRUE);
g_signal_connect(g.view, "key-press-event",
G_CALLBACK(on_key_press_view), NULL);
gtk_container_add(GTK_CONTAINER(g.view_scroller), g.view); gtk_container_add(GTK_CONTAINER(g.view_scroller), g.view);
gtk_widget_show_all(g.view_scroller); gtk_widget_show_all(g.view_scroller);