Merge lp:~harshvardhan1618/pantheon-photos/fix-1425741 into lp:~pantheon-photos/pantheon-photos/trunk

[Harshvardhan Sharma]

Prevent inadvertently entering fullscreen mode while navigating.

This prevents the problem of inadvertently entering fullscreen mode while navigating.

[lp:~harshvardhan1618/pantheon-photos/fix-1425741]

2913. By Harshvardhan Sharma <harshvardhan1618@launchpad> on 2016-04-21

Fix indentation

=== modified file 'src/direct/DirectPhotoPage.vala'
--- src/direct/DirectPhotoPage.vala	2015-08-09 02:34:44 +0000
+++ src/direct/DirectPhotoPage.vala	2016-04-21 18:45:08 +0000
@@ -316,9 +316,13 @@
     }
 
     protected override bool on_double_click (Gdk.EventButton event) {
-        AppWindow.get_instance ().end_fullscreen ();
-
-        return base.on_double_click (event);
+        if (AppWindow.get_fullscreen () != null) {
+            AppWindow.get_instance ().end_fullscreen ();
+        } else {
+            File file = get_current_file ();
+            AppWindow.get_instance ().go_fullscreen (new DirectFullscreenPhotoPage (file));
+        }
+        return true;
     }
 
     protected override void update_ui (bool missing) {

=== modified file 'src/direct/DirectWindow.vala'
--- src/direct/DirectWindow.vala	2014-09-02 19:42:49 +0000
+++ src/direct/DirectWindow.vala	2016-04-21 18:45:08 +0000
@@ -83,16 +83,6 @@
         return (base.delete_event != null) ? base.delete_event (event) : false;
     }
 
-    public override bool button_press_event (Gdk.EventButton event) {
-        if (event.type == Gdk.EventType.2BUTTON_PRESS) {
-            on_fullscreen ();
-
-            return true;
-        }
-
-        return false;
-    }
-
     public override bool key_press_event (Gdk.EventKey event) {
         // check for an escape
         if (Gdk.keyval_name (event.keyval) == "Escape") {