introduce a scribblycontroller

Author: teamcons

data/Application.css

@@ -65,7 +65,8 @@ actionbar .themedbutton:focus {
 }
 
 /* Obfuscate note */
-.scribbly {
+window.scribbly textview.view,
+window.scribbly editablelabel {
     font-family: "Redacted Script";
 }
 

src/Services/ScribblyController.vala

@@ -0,0 +1,72 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText:  2017-2024 Lains
+ *                          2025 Stella & Charlie (teamcons.carrd.co)
+ *                          2025 Contributions from the ellie_Commons community (github.com/ellie-commons/)
+ */
+
+/*************************************************/
+/**
+* Responsible to apply RedactedScript font
+*/
+public class Jorts.ScribblyController : Object {
+
+    private Jorts.StickyNoteWindow window;
+
+    private bool _scribble;
+    public bool scribble {
+        get { return _scribble;}
+        set { scribble_follow_focus (value);}
+    };
+
+    public ScribblyController (Jorts.StickyNoteWindow window) {
+        this.window = window;
+    }
+
+    construct {
+        Application.gsettings.bind (
+            "scribbly-mode-active",
+            this, "scribble",
+            SettingsBindFlags.DEFAULT);
+    }
+
+    /**
+    * Connect-disconnect the whole manage text being scribbled
+    */
+    private void scribble_follow_focus (bool is_activated) {
+        debug ("Scribbly mode changed!");
+
+        if (is_activated) {
+            window.notify["is-active"].connect (focus_scribble_unscribble);
+            scribbly_set (!window.is_active);
+
+        } else {
+            window.notify["is-active"].disconnect (focus_scribble_unscribble);
+            scribbly_set (false);
+        }
+
+        _scribble = is_activated;
+    }
+
+    /**
+    * Handler connected only when scribbly mode is active
+    */
+    private void focus_scribble_unscribble () {
+        debug ("Scribbly mode changed!");
+        scribbly_set (!window.is_active);
+    }
+
+    /**
+    * Wrapper to abstract setting/removing CSS as a book
+    */
+    private void scribbly_set (bool if_scribbly) {
+        if (if_scribbly) {
+            window.add_css_class ("scribbly");
+
+        } else {
+            if ("scribbly" in window.css_classes) {
+                window.remove_css_class ("scribbly");
+            }
+        }
+    }
+}

src/Views/NoteView.vala

@@ -20,11 +20,6 @@
         set { mono_set (value);}
     }
 
-    public bool scribbly {
-        get { return textview.scribbly;}
-        set { scribbly_set (value);}
-    }
-
     public string title {
         owned get { return editablelabel.text;}
         set { editablelabel.text = value;}
@@ -88,9 +83,4 @@
         editablelabel.monospace = if_mono;
         textview.monospace = if_mono;
     }
-
-    private void scribbly_set (bool if_scribbly) {
-        editablelabel.scribbly = if_scribbly;
-        textview.scribbly = if_scribbly;
-    }
 }

src/Widgets/EditableLabel.vala

@@ -28,11 +28,6 @@ public class Jorts.EditableLabel : Granite.Bin {
         set { mono_set (value);}
     }
 
-    public bool scribbly {
-        get { return "scribbly" in this.css_classes;}
-        set { scribbly_set (value);}
-    }
-
     construct {
         editablelabel = new Gtk.EditableLabel ("") {
             xalign = 0.5f,
@@ -64,15 +59,4 @@ public class Jorts.EditableLabel : Granite.Bin {
             }
         }
     }
-
-    private void scribbly_set (bool if_scribbly) {
-        if (if_scribbly) {
-            this.add_css_class ("scribbly");
-
-        } else {
-            if ("scribbly" in this.css_classes) {
-                this.remove_css_class ("scribbly");
-            }
-        }
-    }
 }

src/Widgets/TextView.vala

@@ -16,11 +16,6 @@ public class Jorts.TextView : Granite.HyperTextView {
         set {buffer.text = value;}
     }
 
-    public bool scribbly {
-        get { return "scribbly" in this.css_classes;}
-        set { scribbly_set (value);}
-    }
-
     construct {
         buffer = new Gtk.TextBuffer (null);
         bottom_margin = 10;
@@ -48,15 +43,4 @@ public class Jorts.TextView : Granite.HyperTextView {
             }
         });
     }
-
-    private void scribbly_set (bool if_scribbly) {
-        if (if_scribbly) {
-            this.add_css_class ("scribbly");
-
-        } else {
-            if ("scribbly" in this.css_classes) {
-                this.remove_css_class ("scribbly");
-            }
-        }
-    }
 }

src/Windows/StickyNoteWindow.vala

@@ -21,6 +21,7 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
     public TextView textview;
 
     private Jorts.ZoomController zoomcontroller;
+    private Jorts.ScribblyController scribblycontroller;
 
     public NoteData data {
         owned get { return packaged ();}
@@ -88,7 +89,7 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
         title = "" + _(" - Jorts");
 
         zoomcontroller = new Jorts.ZoomController (this);
-
+        scribblycontroller = new Jorts.ScribblyController (this);
 
         /*****************************************/
         /*              HEADERBAR                */
@@ -110,7 +111,6 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
         /*              LOADING                 */
         /****************************************/
 
-        on_scribbly_changed ();
         load_data (data);
 
         /***************************************************/
@@ -127,10 +127,6 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
         // Use the color theme of this sticky note when focused
         this.notify["is-active"].connect (on_focus_changed);
 
-        //The application tells us the squiffly state has changed!
-        on_scribbly_changed ();
-        Application.gsettings.changed["scribbly-mode-active"].connect (on_scribbly_changed);
-
         // Respect animation settings for showing ui elements
         if (Gtk.Settings.get_default ().gtk_enable_animations && (!Application.gsettings.get_boolean ("hide-bar"))) {
                 show.connect_after (delayed_show);
@@ -185,37 +181,6 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
         }
     }
 
-    /**
-    * Connect-disconnect the whole manage text being scribbled
-    */
-    private void on_scribbly_changed () {
-        debug ("Scribbly mode changed!");
-
-        if (Application.gsettings.get_boolean ("scribbly-mode-active")) {
-            this.notify["is-active"].connect (focus_scribble_unscribble);
-            if (this.is_active) { view.scribbly = false;} else { view.scribbly = true;};
-
-        } else {
-            this.notify["is-active"].disconnect (focus_scribble_unscribble);
-            view.scribbly = false;
-        }
-    }
-
-    /**
-    * Handler connected only when scribbly mode is active
-    * It just hides or show depending on focus
-    */
-    private void focus_scribble_unscribble () {
-        debug ("Scribbly mode changed!");
-
-        if (this.is_active) {
-            view.scribbly = false;
-
-        } else {
-            view.scribbly = true;
-        }
-    }
-
     /**
     * Package the note into a NoteData and pass it back.
     * Used by NoteManager to pass all informations conveniently for storage

src/meson.build

@@ -10,6 +10,7 @@ sources = files (
     'Services' / 'Storage.vala',
     'Services' / 'NoteManager.vala',
     'Services' / 'ZoomController.vala',
+    'Services' / 'ScribblyController.vala',
 
     'Widgets' / 'EditableLabel.vala',
     'Widgets' / 'TextView.vala',