fixed keyboard focus on start-up

https://sourceforge.net/tracker/?func=detail&aid=2707025&group_id=222125&atid=1054680

diff --git a/src/image.c b/src/image.c
index 212d395..d84988c 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -1555,6 +1555,19 @@ void image_set_selectable(ImageWindow *imd, gboolean selectable)
        gtk_container_set_border_width(GTK_CONTAINER(imd->frame), selectable ? 4 : 0);
 }
 
+void image_grab_focus(ImageWindow *imd)
+{
+       if (imd->has_frame)
+               {
+               gtk_widget_grab_focus(imd->frame);
+               }
+       else
+               {
+               gtk_widget_grab_focus(imd->widget);
+               }
+}
+
+
 /*
  *-------------------------------------------------------------------
  * prefs sync

diff --git a/src/image.h b/src/image.h
index c05eaf1..7542dfc 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -49,6 +49,7 @@ void image_set_state_func(ImageWindow *imd,
 void image_select(ImageWindow *imd, gboolean select);
 void image_set_selectable(ImageWindow *imd, gboolean selectable);
 
+void image_grab_focus(ImageWindow *imd);
 /* path, name */
 const gchar *image_get_path(ImageWindow *imd);
 const gchar *image_get_name(ImageWindow *imd);

diff --git a/src/layout.c b/src/layout.c
index 76b6147..26bd75b 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1683,7 +1683,7 @@ static void layout_grid_setup(LayoutWindow *lw)
 
                layout_tools_setup(lw, tools, files);
 
-               gtk_widget_grab_focus(lw->image->widget);
+               image_grab_focus(lw->image);
 
                return;
                }
@@ -1750,7 +1750,7 @@ static void layout_grid_setup(LayoutWindow *lw)
        gtk_paned_set_position(GTK_PANED(lw->h_pane), lw->options.main_window.hdivider_pos);
        gtk_paned_set_position(GTK_PANED(lw->v_pane), lw->options.main_window.vdivider_pos);
 
-       gtk_widget_grab_focus(lw->image->widget);
+       image_grab_focus(lw->image);
 }
 
 void layout_style_set(LayoutWindow *lw, gint style, const gchar *order)