[dconf-editor] Disable fullscreen.



commit b38b275cb45dc7562d7945a4e07da75c4b666b52
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sun Jun 19 02:52:46 2016 +0200

    Disable fullscreen.

 editor/ca.desrt.dconf-editor.gschema.xml |    5 -----
 editor/dconf-window.vala                 |   10 ++--------
 2 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/editor/ca.desrt.dconf-editor.gschema.xml b/editor/ca.desrt.dconf-editor.gschema.xml
index 6afb336..6eb7a68 100644
--- a/editor/ca.desrt.dconf-editor.gschema.xml
+++ b/editor/ca.desrt.dconf-editor.gschema.xml
@@ -21,11 +21,6 @@
       <summary>A flag to enable maximized mode</summary>
       <description>A flag to enable maximized mode</description>
     </key>
-    <key name="window-is-fullscreen" type="b">
-      <default>false</default>
-      <summary>A flag to enable fullscreen mode</summary>
-      <description>A flag to enable fullscreen mode</description>
-    </key>
     <key name="bookmarks" type="as">
       <default>[]</default>
       <summary>A list of bookmarked paths</summary>
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index 2f4979b..7be28da 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -31,7 +31,6 @@ class DConfWindow : ApplicationWindow
     private int window_width = 0;
     private int window_height = 0;
     private bool window_is_maximized = false;
-    private bool window_is_fullscreen = false;
     private bool window_is_tiled = false;
 
     private GLib.Settings settings = new GLib.Settings ("ca.desrt.dconf-editor.Settings");
@@ -49,9 +48,7 @@ class DConfWindow : ApplicationWindow
         settings.changed["delayed-apply-menu"].connect (invalidate_popovers);
 
         set_default_size (settings.get_int ("window-width"), settings.get_int ("window-height"));
-        if (settings.get_boolean ("window-is-fullscreen"))
-            fullscreen ();  // TODO deprecate
-        else if (settings.get_boolean ("window-is-maximized"))
+        if (settings.get_boolean ("window-is-maximized"))
             maximize ();
 
         settings.changed["theme"].connect (() => {
@@ -109,8 +106,6 @@ class DConfWindow : ApplicationWindow
     {
         if ((event.changed_mask & Gdk.WindowState.MAXIMIZED) != 0)
             window_is_maximized = (event.new_window_state & Gdk.WindowState.MAXIMIZED) != 0;
-        if ((event.changed_mask & Gdk.WindowState.FULLSCREEN) != 0)
-            window_is_fullscreen = (event.new_window_state & Gdk.WindowState.FULLSCREEN) != 0;
         /* We don’t save this state, but track it for saving size allocation */
         if ((event.changed_mask & Gdk.WindowState.TILED) != 0)
             window_is_tiled = (event.new_window_state & Gdk.WindowState.TILED) != 0;
@@ -121,7 +116,7 @@ class DConfWindow : ApplicationWindow
     [GtkCallback]
     private void on_size_allocate ()
     {
-        if (window_is_maximized || window_is_fullscreen || window_is_tiled)
+        if (window_is_maximized || window_is_tiled)
             return;
         get_size (out window_width, out window_height);
     }
@@ -135,7 +130,6 @@ class DConfWindow : ApplicationWindow
         settings.set_int ("window-width", window_width);
         settings.set_int ("window-height", window_height);
         settings.set_boolean ("window-is-maximized", window_is_maximized);
-        settings.set_boolean ("window-is-fullscreen", window_is_fullscreen);
 
         base.destroy ();
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]