Merge branch 'main' into wpkelso/styles/avatar

Author: zeebok

.github/workflows/main.yml

@@ -23,13 +23,13 @@ jobs:
       - name: Install Dependencies
         run: |
           apt update
-          apt install -y meson gobject-introspection libgee-0.8-dev libgirepository1.0-dev libgtk-4-dev libshumate-dev sassc valac
+          apt install -y meson gobject-introspection libgee-0.8-dev libgirepository1.0-dev libgtk-4-dev libshumate-dev sassc valac valadoc gtk-doc-tools
       - name: Build
         env:
           DESTDIR: out
           PKG_CONFIG_PATH: ${{ github.workspace }}/build/meson-uninstalled
         run: |
-          meson build
+          meson setup build -Ddocumentation=true
           ninja -C build
           ninja -C build install
 

README.md

@@ -22,9 +22,9 @@ You'll need the following dependencies:
 To build the Demo you'll additionally need:
 * libshumate-dev
 
-Run `meson build` to configure the build environment:
+Run `meson setup` to configure the build environment:
 
-    meson build --prefix=/usr
+    meson setup build --prefix=/usr
 
 This command creates a `build` directory. For all following commands, change to
 the build directory before running them.

data/granite.metainfo.xml.in

@@ -27,7 +27,7 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
-    <release version="7.7.0" date="2025-02-10" urgency="medium">
+    <release version="7.7.0" date="2025-09-30" urgency="medium">
       <description>
         <p>New Icons:</p>
         <ul>

demo/Views/HyperTextViewGrid.vala

@@ -27,9 +27,9 @@ public class HyperTextViewGrid : DemoPage {
         var hypertext_scrolled_window = new Gtk.ScrolledWindow () {
             height_request = 300,
             width_request = 600,
-            child = hypertext_textview
+            child = hypertext_textview,
+            has_frame = true
         };
-        hypertext_scrolled_window.add_css_class (Granite.STYLE_CLASS_FRAME);
 
         var box = new Granite.Box (VERTICAL, NONE) {
             halign = CENTER,

demo/Views/WelcomeView.vala

@@ -45,7 +45,7 @@ public class WelcomeView : DemoPage {
             margin_start = 12
         };
         listbox.set_placeholder (search_placeholder);
-        listbox.add_css_class (Granite.STYLE_CLASS_FRAME);
+        listbox.add_css_class (Granite.CssClass.CARD);
 
         var search_entry = new Gtk.SearchEntry () {
             margin_top = 12,

lib/StyleManager.vala

@@ -21,7 +21,7 @@ public class Granite.StyleManager : Object {
 
     /**
      * Returns the {@link Granite.StyleManager} that handles the default display
-     * as gotten by {@link Gdk.Display.get_default ()}.
+     * as gotten by {@link Gdk.Display.get_default}.
      */
     public static unowned StyleManager get_default () {
         return style_managers_by_displays[Gdk.Display.get_default ()];
@@ -44,8 +44,8 @@ public class Granite.StyleManager : Object {
 
     /**
      * The {@link Granite.Settings.ColorScheme} requested by the application
-     * Uses value from {@link Granite.Settings.prefers_color_scheme} when set to {@link Granite.Settings.ColorScheme.NO_PREFERENCE }.
-     * Default value is {@link Granite.Settings.ColorScheme.NO_PREFERENCE }
+     * Uses value from {@link Granite.Settings.prefers_color_scheme} when set to {@link Granite.Settings.ColorScheme.NO_PREFERENCE}.
+     * Default value is {@link Granite.Settings.ColorScheme.NO_PREFERENCE}
      */
     public Settings.ColorScheme color_scheme { get; set; default = NO_PREFERENCE; }
 

lib/Styles/Gtk/Slider.scss

@@ -1,4 +1,5 @@
 slider {
+    $diameter: rem(16px);
     @include control;
 
     border: none;
@@ -9,6 +10,10 @@ slider {
         0 0 0 1px $border-color,
         shadow(2);
 
+    // 16px - border
+    min-height: calc(#{$diameter} - 1px);
+    min-width: calc(#{$diameter} - 1px);
+
     &:backdrop {
         box-shadow:
             highlight(),

lib/Widgets/Box.vala

@@ -10,6 +10,7 @@
  */
 [Version (since = "7.7.0")]
 public class Granite.Box : Gtk.Box {
+    [Version (since = "7.7.0")]
     public enum Spacing {
         NONE,
         // Spacing between groups of related controls like {@link Gtk.CheckButton}

po/LINGUAS

@@ -188,7 +188,6 @@ yo
 za
 zh
 zh_CN
-zh_HK
 zh_TW
 zu
 ace
@@ -204,3 +203,6 @@ ca@valencia
 en_ZA
 pap
 sco
+zh_HK
+zh_HANT
+zh_HANS

po/extra/LINGUAS

@@ -188,7 +188,6 @@ yo
 za
 zh
 zh_CN
-zh_HK
 zh_TW
 zu
 ace
@@ -204,3 +203,6 @@ ca@valencia
 en_ZA
 pap
 sco
+zh_HK
+zh_HANT
+zh_HANS