From 6ae952ebb4a4fb144b15eb1b41ada7b0bb4ffbbd Mon Sep 17 00:00:00 2001
From: Balazs Gyurak <ba32107@gmail.com>
Date: Sun, 5 Jan 2020 18:32:30 +0000
Subject: [PATCH 1/3] Reorder settings and rename preview setting

---
 prefs.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/prefs.js b/prefs.js
index c4ab543..bf60316 100644
--- a/prefs.js
+++ b/prefs.js
@@ -78,21 +78,6 @@ function buildPrefsWidget() {
     layout.attach(colsLabel, 0, row, 1, 1);
     layout.attach(colsInput, 1, row++, 1, 1);
 
-    // Maximize setting
-    let doubleWidthLabel = new Gtk.Label({
-        label: _("Use double width previews on sides in 4 column mode"),
-        visible: true,
-        hexpand: true,
-        halign: Gtk.Align.START
-    });
-    let doubleWidthInput = new Gtk.Switch({
-        active: this.settings.get_boolean ('double-width'),
-        halign: Gtk.Align.END,
-        visible: true
-    });
-    layout.attach(doubleWidthLabel, 0, row, 1, 1);
-    layout.attach(doubleWidthInput, 1, row++, 1, 1);
-
     // Maximize setting
     let maximizeLabel = new Gtk.Label({
         label: _("Use true maximizing of windows"),
@@ -108,9 +93,9 @@ function buildPrefsWidget() {
     layout.attach(maximizeLabel, 0, row, 1, 1);
     layout.attach(maximizeInput, 1, row++, 1, 1);
 
-    // Preview setting
+    // Preview settings
     let previewLabel = new Gtk.Label({
-        label: _("Turn on mouse dragging support"),
+        label: _("Enable preview while dragging windows"),
         visible: true,
         hexpand: true,
         halign: Gtk.Align.START
@@ -123,6 +108,21 @@ function buildPrefsWidget() {
     layout.attach(previewLabel, 0, row, 1, 1);
     layout.attach(previewInput, 1, row++, 1, 1);
 
+    // Double width previews
+    let doubleWidthLabel = new Gtk.Label({
+        label: _("    Use double width previews on sides in 4 column mode"),
+        visible: true,
+        hexpand: true,
+        halign: Gtk.Align.START
+    });
+    let doubleWidthInput = new Gtk.Switch({
+        active: this.settings.get_boolean ('double-width'),
+        halign: Gtk.Align.END,
+        visible: true
+    });
+    layout.attach(doubleWidthLabel, 0, row, 1, 1);
+    layout.attach(doubleWidthInput, 1, row++, 1, 1);
+
     // Debug setting
     let debugLabel = new Gtk.Label({
         label: _("Turn on debugging"),

From 40cf21160d5befc946c11a38ceed2bc9f03913a6 Mon Sep 17 00:00:00 2001
From: Balazs Gyurak <ba32107@gmail.com>
Date: Sun, 5 Jan 2020 22:13:19 +0000
Subject: [PATCH 2/3] Add event to disable sub option

---
 prefs.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/prefs.js b/prefs.js
index bf60316..9df6a02 100644
--- a/prefs.js
+++ b/prefs.js
@@ -110,7 +110,7 @@ function buildPrefsWidget() {
 
     // Double width previews
     let doubleWidthLabel = new Gtk.Label({
-        label: _("    Use double width previews on sides in 4 column mode"),
+        label: _("     Use double width previews on sides in 4 column mode"),
         visible: true,
         hexpand: true,
         halign: Gtk.Align.START
@@ -123,6 +123,11 @@ function buildPrefsWidget() {
     layout.attach(doubleWidthLabel, 0, row, 1, 1);
     layout.attach(doubleWidthInput, 1, row++, 1, 1);
 
+    previewInput.connect('state-set', function(widget, state) {
+        doubleWidthLabel.set_sensitive(state);
+        doubleWidthInput.set_sensitive(state);
+    });
+
     // Debug setting
     let debugLabel = new Gtk.Label({
         label: _("Turn on debugging"),

From fee3ed9c0cb484fee0a6f5e68565043760413321 Mon Sep 17 00:00:00 2001
From: Balazs Gyurak <ba32107@gmail.com>
Date: Sun, 5 Jan 2020 22:32:51 +0000
Subject: [PATCH 3/3] Set state on panel open

---
 prefs.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/prefs.js b/prefs.js
index 9df6a02..011604e 100644
--- a/prefs.js
+++ b/prefs.js
@@ -94,6 +94,7 @@ function buildPrefsWidget() {
     layout.attach(maximizeInput, 1, row++, 1, 1);
 
     // Preview settings
+    let previewEnabled = this.settings.get_boolean ('preview');
     let previewLabel = new Gtk.Label({
         label: _("Enable preview while dragging windows"),
         visible: true,
@@ -101,7 +102,7 @@ function buildPrefsWidget() {
         halign: Gtk.Align.START
     });
     let previewInput = new Gtk.Switch({
-        active: this.settings.get_boolean ('preview'),
+        active: previewEnabled,
         halign: Gtk.Align.END,
         visible: true
     });
@@ -123,11 +124,6 @@ function buildPrefsWidget() {
     layout.attach(doubleWidthLabel, 0, row, 1, 1);
     layout.attach(doubleWidthInput, 1, row++, 1, 1);
 
-    previewInput.connect('state-set', function(widget, state) {
-        doubleWidthLabel.set_sensitive(state);
-        doubleWidthInput.set_sensitive(state);
-    });
-
     // Debug setting
     let debugLabel = new Gtk.Label({
         label: _("Turn on debugging"),
@@ -149,6 +145,16 @@ function buildPrefsWidget() {
     this.settings.bind('preview', previewInput, 'active', Gio.SettingsBindFlags.DEFAULT);
     this.settings.bind('debug', debugInput, 'active', Gio.SettingsBindFlags.DEFAULT);
 
+    let setDoubleWidthWidgetsEnabled = function(enabled) {
+        doubleWidthLabel.set_sensitive(enabled);
+        doubleWidthInput.set_sensitive(enabled);
+    };
+
+    setDoubleWidthWidgetsEnabled(previewEnabled);
+    previewInput.connect('state-set', function(widget, state) {
+        setDoubleWidthWidgetsEnabled(state);
+    });
+
     // Return our widget which will be added to the window
     return layout;
-}
\ No newline at end of file
+}