Merge branch 'main' into Working-branch

Author: teamcons

src/Objects/NoteData.vala

@@ -14,14 +14,14 @@ public class Jorts.NoteData : Object {
 
     // Will determine properties (or lack thereof) for any new note
     public static Jorts.Themes latest_theme = Jorts.Constants.DEFAULT_THEME;
-    public static uint8? latest_zoom = Jorts.Constants.DEFAULT_ZOOM;
+    public static uint16? latest_zoom = Jorts.Constants.DEFAULT_ZOOM;
     public static bool latest_mono = Jorts.Constants.DEFAULT_MONO;
 
     public string title;
     public Jorts.Themes theme;
     public string content;
     public bool monospace;
-    public uint8 zoom;
+    public uint16 zoom;
     public int width;
     public int height;
 
@@ -30,7 +30,7 @@ public class Jorts.NoteData : Object {
     * Convert into a Json.Object()
     */
     public NoteData (string? title = null, Jorts.Themes? theme = null, string? content = null,
-                    bool? monospace = null, uint8? zoom = null, int? width = null, int? height = null)
+                    bool? monospace = null, uint16? zoom = null, int? width = null, int? height = null)
     {
         // We assign defaults in case theres args missing
         this.title = title ?? Jorts.Utils.random_title ();
@@ -52,7 +52,7 @@ public class Jorts.NoteData : Object {
         theme = Jorts.Themes.from_string (themestring);
         content     = node.get_string_member_with_default ("content","");
         monospace   = node.get_boolean_member_with_default ("monospace",Jorts.Constants.DEFAULT_MONO);
-        zoom        = (uint8)node.get_int_member_with_default ("zoom",Jorts.Constants.DEFAULT_ZOOM);
+        zoom        = (uint16)node.get_int_member_with_default ("zoom",Jorts.Constants.DEFAULT_ZOOM);
 
         // Make sure the values are nothing crazy
         if (zoom < Jorts.Constants.ZOOM_MIN)        { zoom = Jorts.Constants.ZOOM_MIN;}

src/Objects/Zoom.vala

@@ -30,7 +30,7 @@ public enum Jorts.Zoom {
     /**
     * Returns an Int representation we can use to display and store the value
     */
-    public uint8 to_int () {
+    public uint16 to_int () {
         switch (this) {
             case ANTSIZED: return 20;
             case MUCHSMALLER: return 40;
@@ -55,7 +55,7 @@ public enum Jorts.Zoom {
     /**
     * We cannot save Enums in JSON, so this recovers the enum from stored int
     */
-    public static Zoom from_int (uint8 wtf_is_this) {
+    public static Zoom from_int (uint16 wtf_is_this) {
         switch (wtf_is_this) {
             case 20: return ANTSIZED;
             case 40: return MUCHSMALLER;
@@ -105,7 +105,7 @@ public enum Jorts.Zoom {
     /**
     * We have to scale some UI elements according to zoom
     */
-    public uint8 to_size () {
+    public uint16 to_size () {
         switch (this) {
             case ANTSIZED: return 24;
             case MUCHSMALLER: return 26;

src/Services/Constants.vala

@@ -27,9 +27,9 @@ namespace Jorts.Constants {
     const int DEBOUNCE                   = 1000;
 
     // We need to say stop at some point
-    const uint8 ZOOM_MAX                   = 240;
-    const uint8 DEFAULT_ZOOM               = 100;
-    const uint8 ZOOM_MIN                   = 40;
+    const uint16 ZOOM_MAX                   = 240;
+    const uint16 DEFAULT_ZOOM               = 100;
+    const uint16 ZOOM_MIN                   = 40;
     const bool DEFAULT_MONO               = false;
 
     // For new stickies

src/Utils/ZoomConvert.vala

@@ -9,7 +9,7 @@ namespace Jorts.Utils {
 
     /*************************************************/
     // We cannot use numbers in CSS, so we have to translate a number into a string
-    public string zoom_to_class (uint8 zoom) {
+    public string zoom_to_class (uint16 zoom) {
         switch (zoom) {
             case 20: return "antsized";
             case 40: return "muchsmaller";
@@ -32,7 +32,7 @@ namespace Jorts.Utils {
 
     /*************************************************/
     // We cannot use numbers in CSS, so we have to translate a number into a string
-    public uint8 zoom_to_ui_size (uint8 zoom) {
+    public uint16 zoom_to_ui_size (uint16 zoom) {
         switch (zoom) {
             case 20: return 24;
             case 40: return 26;

src/Views/PopoverView.vala

@@ -26,8 +26,8 @@ public class Jorts.PopoverView : Gtk.Popover {
         set {on_monospace_changed (value);}
     }
 
-    private uint8 _old_zoom;
-    public uint8 zoom {
+    private uint16 _old_zoom;
+    public uint16 zoom {
         get {return font_size_box.zoom;}
         set {do_set_zoom (value);}
     }
@@ -160,7 +160,7 @@ public class Jorts.PopoverView : Gtk.Popover {
     /**
     * Switch zoom classes, then reflect in the UI and tell the application
     */
-    private void do_set_zoom (uint8 new_zoom) {
+    private void do_set_zoom (uint16 new_zoom) {
         debug ("Setting zoom: " + zoom.to_string ());
 
         // Switches the classes that control font size

src/Widgets/PopoverWidgets/ZoomBox.vala

@@ -13,9 +13,9 @@
 public class Jorts.ZoomBox : Gtk.Box {
 
     private Gtk.Button zoom_default_button;
-    private uint8 _zoom = 100;
+    private uint16 _zoom = 100;
 
-    public uint8 zoom {
+    public uint16 zoom {
         get { return _zoom;}
         set {
             _zoom = value;