Merge branch 'feature/upstream' into develop

1 files changed, 7 insertions, 10 deletions

diff --git a/src/direct/DirectWindow.vala b/src/direct/DirectWindow.vala
index e1cbf75..9eec5b1 100644
--- a/src/direct/DirectWindow.vala
+++ b/src/direct/DirectWindow.vala
@@ -8,6 +8,8 @@ public class DirectWindow : AppWindow {
     private DirectPhotoPage direct_photo_page;
     
     public DirectWindow(File file) {
+	base();
+
         direct_photo_page = new DirectPhotoPage(file);
         direct_photo_page.get_view().items_altered.connect(on_photo_changed);
         direct_photo_page.get_view().items_state_changed.connect(on_photo_changed);
@@ -42,6 +44,11 @@ public class DirectWindow : AppWindow {
             get_display_pathname(file.get_parent()), Resources.APP_TITLE);
     }
     
+    // Expose on_fullscreen publicly so we can call it from the DirectPhotoPage
+    public void do_fullscreen() {
+        on_fullscreen();
+    }
+
     protected override void on_fullscreen() {
         File file = get_direct_page().get_current_file();
         
@@ -74,16 +81,6 @@ public class DirectWindow : AppWindow {
         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") {