Some cleanup

Author: teamcons

data/Application.css

@@ -79,6 +79,14 @@ windowcontrols button:focus {
     transition: color 800ms cubic-bezier(0.4, 0, 0.2, 1);
 }
 
+/* Have windowcontrol act like the other buttons */
+windowcontrols:backdrop button:hover {
+    background: alpha(@fg_color, 0.3);
+}
+windowcontrols:backdrop button:not(:hover) {
+	background: none;
+}
+
 editablelabel {
     font-weight: 800;
     font-size: 1.10em;
@@ -88,6 +96,7 @@ editablelabel {
     letter-spacing: .02em;
 }
 
+/* Smaller text when editing */
 editablelabel.editing {
     font-weight: 500;
     font-size: 1em;
@@ -166,6 +175,10 @@ window.ultrahuge textview {font-size: 2.8em;}
 window.ultrahuge editablelabel {font-size: 2.65em;}
 window.ultrahuge editablelabel.editing {font-size: 2.60em;}
 
+window.urmom textview {font-size: 3em;}
+window.urmom editablelabel {font-size: 2.85em;}
+window.urmom editablelabel.editing {font-size: 2.80em;}
+
 
 /* ALL the colorpills */
 colorpill.blueberry {background-color: @BLUEBERRY_300;}

src/MainWindow.vala

@@ -220,12 +220,13 @@ namespace jorts {
                 return false;           
             });
 
-            this.popover.show.connect(() => {
-                //popover.set_zoomlevel(this.zoom);
+            this.activate_focus.connect(() => {
+                print("Focused! " + this.title );
 
+                //popover.set_zoomlevel(this.zoom);
                 // Use appropriate sheet
-                var stylesheet = "io.elementary.stylesheet." + this.theme.ascii_down();
-                this.gtk_settings.gtk_theme_name = stylesheet;
+                    var stylesheet = "io.elementary.stylesheet." + this.theme.ascii_down();
+                    this.gtk_settings.gtk_theme_name = stylesheet;
             });
 
 

src/Services/Constants.vala

@@ -27,6 +27,9 @@ Just Dump constants here
 
 namespace jorts.Constants {
 
+    const string app_rdnn               = "io.github.ellie_commons.jorts";
+
+
     // As seen on TV!
     // Later adds: LATTE, BLACK, SILVER, AUTO
     const string[] themearray = {
@@ -42,11 +45,10 @@ namespace jorts.Constants {
         "SLATE"
     };
 
-    const string app_rdnn               = "io.github.ellie_commons.jorts";
 
     // We need to say stop at some point
     const int max_zoom                  = 200;
-    const int min_zoom                  = 60;
+    const int min_zoom                  = 40;
 
     // For new stickies
     const int defaut_height             = 330;

src/Services/Themer.vala

@@ -35,6 +35,7 @@ init_all_themes()
 namespace jorts.Themer {
 
     // Here we go
+    // Take up a elementary OS color name and gurgle back a CSS string
     public static string generate_css (string theme) {
         debug("Generating css");
         string style = "";
@@ -119,15 +120,15 @@ namespace jorts.Themer {
             }
 
             window.${accent_color}:backdrop editablelabel {
-                color: alpha(@${accent_color}_900, 0.88);
+                color: alpha(@${accent_color}_900, 0.75);
             }
 
             window.${accent_color}:backdrop editablelabel,
             window.${accent_color}:backdrop actionbar,
             window.${accent_color}:backdrop actionbar image,
             window.${accent_color}:backdrop windowcontrols,
             window.${accent_color}:backdrop windowcontrols image {
-                color: alpha(@${accent_color}_900, 0.88);
+                color: alpha(@${accent_color}_900, 0.75);
             }
 
         """));
@@ -137,9 +138,12 @@ namespace jorts.Themer {
         return style;
     }
 
+    // Called once, at the start of the app
+    // Loads the standard sheet, then do all the different themes
     public static void init_all_themes() {
+        debug("Init all themes");
 
-        // Also the standard sheet
+        // Use standard sheet
         var app_provider = new Gtk.CssProvider ();
         app_provider.load_from_resource ("/io/github/ellie_commons/jorts/Application.css");
         Gtk.StyleContext.add_provider_for_display (
@@ -148,23 +152,18 @@ namespace jorts.Themer {
             Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 1
         );
 
-        debug("Init all themes");
+        // Then generate all theme classes
         foreach (unowned var theme in jorts.Constants.themearray) {
-            // Palette color
-              var theme_provider = new Gtk.CssProvider ();
-              var style = jorts.Themer.generate_css (theme);
-
-            // for the move away from stylecontext
-            // print(style);
+            var theme_provider = new Gtk.CssProvider ();
+            var style = jorts.Themer.generate_css (theme);
 
             theme_provider.load_from_string (style);
 
-
-              Gtk.StyleContext.add_provider_for_display (
-                  Gdk.Display.get_default (),
-                  theme_provider,
-                  Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
-              );
-          }
+            Gtk.StyleContext.add_provider_for_display (
+                Gdk.Display.get_default (),
+                theme_provider,
+                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
+            );
+        }
     }
 }

src/Services/Utils.vala

@@ -49,6 +49,7 @@ namespace jorts.Utils {
             case 220: return "superhuge";
             case 240: return "megahuge";
             case 260: return "ultrahuge";
+            case 280: return "urmom";
             default: return "normal_zoom";
         }
     }