Zoom which now functions

Author: teamcons

src/Objects/Zoomkind.vala

@@ -21,10 +21,10 @@
 
         if (delta > 0)
         {
-            return ZOOM_IN;
+            return ZOOM_OUT;
 
         } else {
-            return ZOOM_OUT;
+            return ZOOM_IN;
         }
     }
 }

src/Services/ZoomController.vala

@@ -16,9 +16,7 @@ public class Jorts.ZoomController : Object {
     private Jorts.StickyNoteWindow window;
 
     // We keep those values static as we dont need to track instance specific
-    public static double current_scroll_delta = 0;
     public static bool is_control_key_pressed = false;
-    public static uint8 sensitivity = 1;
 
     // Avoid setting this unless it is to restore a specific value, do_set_zoom does not check input
     private uint16 _old_zoom;
@@ -31,18 +29,6 @@ public class Jorts.ZoomController : Object {
         this.window = window;
     }
 
-    construct {
-        var keypress_controller = new Gtk.EventControllerKey ();
-        keypress_controller.key_pressed.connect (on_key_press_event);
-        keypress_controller.key_released.connect (on_key_release_event);
-        ((Gtk.Widget)window).add_controller ((Gtk.EventController)keypress_controller);
-
-        var scroll_controller = new Gtk.EventControllerScroll (VERTICAL);
-        scroll_controller.scroll_end.connect (() => current_scroll_delta = 0);
-        scroll_controller.scroll.connect (on_scroll);
-        ((Gtk.Widget)window).add_controller ((Gtk.EventController)scroll_controller);
-    }
-
     /**
     * Handler. Wraps a zoom enum into the correct function-
     */
@@ -109,33 +95,37 @@ public class Jorts.ZoomController : Object {
         window.changed ();
     }
 
-    private bool on_key_press_event (uint keyval, uint keycode, Gdk.ModifierType state) {
+    public bool on_key_press_event (uint keyval, uint keycode, Gdk.ModifierType state) {
         if (keyval == Gdk.Key.Control_L || keyval == Gdk.Key.Control_R) {
+            print ("Press!");
             is_control_key_pressed = true;
+
+            // disable scrolling for the stickies else it will prevent what we are trying to do
+            window.view.scrolled.sensitive = false;
         }
 
         return Gdk.EVENT_PROPAGATE;
     }
 
-    private void on_key_release_event (uint keyval, uint keycode, Gdk.ModifierType state) {
+    public void on_key_release_event (uint keyval, uint keycode, Gdk.ModifierType state) {
         if (keyval == Gdk.Key.Control_L || keyval == Gdk.Key.Control_R) {
+            debug ("Release!");
             is_control_key_pressed = false;
-        }
-    }
 
-    private bool on_scroll (double dx, double dy) {
-        if (!is_control_key_pressed) { return false;}
-
-        if (current_scroll_delta == 0) {
-            zoom_changed (Zoomkind.from_delta (dy));
+            // Allow scrolling again
+            window.view.scrolled.sensitive = true;
         }
+    }
 
-        current_scroll_delta += dy;
+    public bool on_scroll (double dx, double dy) {
+        debug ("Scroll + Ctrl!");
 
-        if (current_scroll_delta.abs () > sensitivity) { // Balance between reactive and ignoring misinput
-            current_scroll_delta = 0;
+        if (!is_control_key_pressed) {
+            return false;
         }
 
-        return true;
+        zoom_changed (Zoomkind.from_delta (dy));
+        debug ("Go! Zoooommmmm");
+        return false;
     }
 }

src/Views/NoteView.vala

@@ -15,6 +15,8 @@
     public Gtk.EmojiChooser emojichooser_popover;
     public Gtk.MenuButton menu_button;
 
+    public Gtk.ScrolledWindow scrolled;
+
     public bool monospace {
         get { return textview.monospace;}
         set { mono_set (value);}
@@ -45,7 +47,7 @@
         headerbar.set_title_widget (editablelabel);
 
         textview = new Jorts.TextView ();
-        var scrolled = new Gtk.ScrolledWindow () {
+        scrolled = new Gtk.ScrolledWindow () {
             child = textview
         };
 

src/Views/PopoverView.vala

@@ -70,10 +70,6 @@ public class Jorts.PopoverView : Gtk.Popover {
         // Avoid deathloop where the handler calls itself
         color_button_box.theme_changed.disconnect (on_color_changed);
 
-        // Accent
-        var stylesheet = "io.elementary.stylesheet." + new_theme.to_css_class ();
-        parent_window.gtk_settings.gtk_theme_name = stylesheet;
-
         // Add remove class
         if (_old_color.to_string () in parent_window.css_classes) {
             parent_window.remove_css_class (_old_color.to_string ());

src/Windows/PreferenceWindow.vala

@@ -16,7 +16,7 @@ the innerbox has widgets for settings.
 the actionbar has a donate me and a set back to defaults just like elementaryOS
 
 */
-public class Jorts.PreferenceWindow : Gtk.ApplicationWindow {
+public class Jorts.PreferenceWindow : Gtk.Window {
 
     public PreferenceWindow (Jorts.Application app) {
         debug ("[PREFWINDOW] Creating preference window");

src/Windows/StickyNoteWindow.vala

@@ -13,7 +13,7 @@
 * Can be packaged into a noteData file for convenient storage
 * Reports to the NoteManager for saving
 */
-public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
+public class Jorts.StickyNoteWindow : Gtk.Window {
 
     public Jorts.NoteView view;
     public PopoverView popover;
@@ -29,6 +29,9 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
 
     public signal void changed ();
 
+    private Gtk.EventControllerKey keypress_controller;
+    private Gtk.EventControllerScroll scroll_controller;
+
     private const string ACTION_PREFIX = "app.";
     private const string ACTION_SHOW_EMOJI = "action_show_emoji";
     private const string ACTION_SHOW_MENU = "action_show_menu";
@@ -88,6 +91,16 @@ public class Jorts.StickyNoteWindow : Gtk.ApplicationWindow {
         zoomcontroller = new Jorts.ZoomController (this);
         scribblycontroller = new Jorts.ScribblyController (this);
 
+        keypress_controller = new Gtk.EventControllerKey ();
+        keypress_controller.key_pressed.connect (zoomcontroller.on_key_press_event);
+        keypress_controller.key_released.connect (zoomcontroller.on_key_release_event);
+        ((Gtk.Widget)this).add_controller (keypress_controller);
+
+        scroll_controller = new Gtk.EventControllerScroll (VERTICAL);
+        scroll_controller.scroll.connect (zoomcontroller.on_scroll);
+        ((Gtk.Widget)this).add_controller (scroll_controller);
+
+
         /*****************************************/
         /*              HEADERBAR                */
         /*****************************************/