Fix #262: double click and fullscreen

https://github.com/BestImageViewer/geeqie/issues/262

diff --git a/src/image.c b/src/image.c
index 76724db..e04037f 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -1941,7 +1941,7 @@ ImageWindow *image_new(gboolean frame)
 
        image_set_selectable(imd, 0);
 
 
        image_set_selectable(imd, 0);
 

-       g_signal_connect(G_OBJECT(imd->pr), "clicked",
+       g_signal_connect(G_OBJECT(imd->pr), "button_press_event",

                         G_CALLBACK(image_click_cb), imd);
        g_signal_connect(G_OBJECT(imd->pr), "scroll_notify",
                         G_CALLBACK(image_scroll_notify_cb), imd);
                         G_CALLBACK(image_click_cb), imd);
        g_signal_connect(G_OBJECT(imd->pr), "scroll_notify",
                         G_CALLBACK(image_scroll_notify_cb), imd);

diff --git a/src/layout_image.c b/src/layout_image.c
index f1a3cb9..0872612 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -1690,6 +1690,11 @@ static void layout_image_button_cb(ImageWindow *imd, GdkEventButton *event, gpoi
        switch (event->button)
                {
                case MOUSE_BUTTON_LEFT:
        switch (event->button)
                {
                case MOUSE_BUTTON_LEFT:

+                       if (event->type == GDK_2BUTTON_PRESS)
+                               {
+                               if (lw->full_screen)
+                                       layout_image_full_screen_stop(lw);
+                               }

                        if (options->image_lm_click_nav && lw->split_mode == SPLIT_NONE)
                                layout_image_next(lw);
                        break;
                        if (options->image_lm_click_nav && lw->split_mode == SPLIT_NONE)
                                layout_image_next(lw);
                        break;