Merge branch 'master' into remove-greeter-workaround

elementary · Jan 27, 2024 · c05ab8d · c05ab8d
2 parents 76105c2 + 0fb4a14
commit c05ab8d
Show file tree

Hide file tree

Showing 42 changed files with 1,472 additions and 156 deletions.
diff --git a/.github/workflows/gettext.yml b/.github/workflows/gettext.yml
@@ -17,7 +17,7 @@ jobs:
         apt-get install git -y
 
     - name: Clone repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: |
         apt update
@@ -42,7 +42,7 @@ jobs:
       image: valalang/lint
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Lint
       run: |
         io.elementary.vala-lint -d lib

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
      runs-on: ubuntu-latest
      if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
      steps:
-     - uses: actions/checkout@v3
+     - uses: actions/checkout@v4
      - uses: elementary/actions/release@master
        env:
          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

diff --git a/data/meson.build b/data/meson.build
@@ -13,7 +13,7 @@ install_data(
 i18n.merge_file(
     input: 'wingpanel.desktop.in',
     output: meson.project_name() + '.desktop',
-    po_dir: join_paths(meson.source_root(), 'po', 'extra'),
+    po_dir: join_paths(meson.project_source_root(), 'po', 'extra'),
     type: 'desktop',
     install: true,
     install_dir: join_paths(get_option('datadir'), 'applications')
@@ -22,7 +22,7 @@ i18n.merge_file(
 i18n.merge_file(
     input: 'wingpanel.appdata.xml.in',
     output: meson.project_name() + '.appdata.xml',
-    po_dir: join_paths(meson.source_root(), 'po', 'extra'),
+    po_dir: join_paths(meson.project_source_root(), 'po', 'extra'),
     type: 'xml',
     install: true,
     install_dir: join_paths(get_option('datadir'), 'metainfo'),

diff --git a/data/styles/Application.css b/data/styles/Application.css
@@ -0,0 +1,107 @@
+panel {
+    background-color: transparent;
+    transition: all 200ms cubic-bezier(0.4, 0, 0.2, 1);
+    min-height: 16px;
+}
+
+panel > box {
+    /*Don't transition shadow etc to avoid visual issues with struts*/
+    transition: background 200ms cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+panel.maximized {
+    background-color: #000;
+}
+
+panel.translucent > box {
+    border-radius: 5px 5px 0 0;
+    margin-bottom: 4px;
+}
+
+panel.translucent.color-dark > box {
+    background-color: alpha(black, 0.4);
+    box-shadow:
+        0 1px 3px alpha(#000, 0.3),
+        0 1px 1px alpha(#000, 0.3);
+}
+
+panel.translucent.color-light > box {
+    background-color: alpha(white, 0.75);
+    box-shadow:
+        inset 0 -1px 0 0 alpha(white, 0.2),
+        inset 0 1px 0 0 alpha(white, 0.3),
+        inset 1px 0 0 0 alpha(white, 0.07),
+        inset -1px 0 0 0 alpha(white, 0.07),
+        0 1px 3px alpha(black, 0.16),
+        0 1px 1px alpha(black, 0.1);
+}
+
+panel menubar {
+    background: transparent;
+    box-shadow: none;
+    border: none;
+}
+
+.composited-indicator {
+    padding: 0 6px;
+}
+
+.composited-indicator > revealer {
+    color: white;
+    font-weight: bold;
+    text-shadow:
+        0 0 2px alpha(black, 0.3),
+        0 1px 2px alpha(black, 0.6);
+    transition: all 200ms cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.composited-indicator > revealer image,
+.composited-indicator > revealer spinner {
+    -gtk-icon-shadow:
+        0 0 2px alpha(black, 0.3),
+        0 1px 2px alpha(black, 0.6);
+    -gtk-icon-palette:
+        error @STRAWBERRY_300,
+        success @LIME_300,
+        warning mix(@BANANA_300, @BANANA_500, 0.5);
+}
+
+.color-light .composited-indicator > revealer {
+    color: alpha(black, 0.65);
+    text-shadow:
+        0 0 2px alpha(white, 0.3),
+        0 1px 0 alpha(white, 0.25);
+}
+
+.color-light .composited-indicator > revealer image,
+.color-light .composited-indicator > revealer spinner {
+    -gtk-icon-shadow:
+        0 0 2px alpha(white, 0.3),
+        0 1px 0 alpha(white, 0.25);
+    -gtk-icon-palette:
+        error @STRAWBERRY_700,
+        success mix(@LIME_700, @LIME_900, 0.5),
+        warning mix(@BANANA_700, @BANANA_900, 0.5);
+}
+
+.translucent.color-dark .composited-indicator > revealer {
+    text-shadow:
+        0 0 2px alpha(black, 0.15),
+        0 1px 2px alpha(black, 0.3);
+}
+
+.translucent.color-dark .composited-indicator > revealer image,
+.translucent.color-dark .composited-indicator > revealer spinner {
+    -gtk-icon-shadow:
+        0 0 2px alpha(black, 0.15),
+        0 1px 2px alpha(black, 0.3);
+}
+
+.translucent.color-light .composited-indicator > revealer {
+    text-shadow: none;
+}
+
+.translucent.color-light .composited-indicator > revealer image,
+.translucent.color-light .composited-indicator > revealer spinner {
+    -gtk-icon-shadow: none;
+}
diff --git a/data/styles/application.css b/data/styles/application.css
diff --git a/data/styles/panel.css b/data/styles/panel.css
diff --git a/data/wingpanel.appdata.xml.in b/data/wingpanel.appdata.xml.in
@@ -12,7 +12,19 @@
   </description>
 
   <releases>
-    <release version="3.0.4" date="2023-18-28" urgency="medium">
+    <release version="3.0.5" date="2023-09-13" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+        <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/wingpanel/issues/502">The WiFi indicator keeps moving over to the left side next to the calendar and time</issue>
+      </issues>
+    </release>
+
+    <release version="3.0.4" date="2023-08-28" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>
@@ -121,7 +133,7 @@
   </provides>
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/wingpanel/3.0.4/data/screenshot.png</image>
+      <image>https://raw.githubusercontent.com/elementary/wingpanel/3.0.5/data/screenshot.png</image>
     </screenshot>
   </screenshots>
   <compulsory_for_desktop>Pantheon</compulsory_for_desktop>

diff --git a/data/wingpanel.gresource.xml b/data/wingpanel.gresource.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/wingpanel">
-    <file alias="application.css" compressed="true">styles/application.css</file>
-    <file alias="panel.css" compressed="true">styles/panel.css</file>
+    <file alias="Application.css" compressed="true">styles/Application.css</file>
   </gresource>
 </gresources>
diff --git a/meson.build b/meson.build
@@ -1,12 +1,12 @@
 project(
     'io.elementary.wingpanel',
     'c', 'vala',
-    version: '3.0.4',
-    meson_version : '>= 0.57'
+    version: '3.0.5',
+    meson_version : '>= 0.58.0'
 )
 
 add_project_arguments([
-        '--vapidir=' + join_paths(meson.source_root(), 'vapi'),
+        '--vapidir=' + join_paths(meson.project_source_root(), 'vapi'),
     ],
     language: 'vala',
 )

diff --git a/po/extra/meson.build b/po/extra/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext('extra',
-    args: '--directory=' + meson.source_root(),
+    args: '--directory=' + meson.project_source_root(),
     preset: 'glib',
     install: false
 )
diff --git a/po/meson.build b/po/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext(meson.project_name(),
-    args: ['--directory='+meson.source_root()],
+    args: ['--directory='+meson.project_source_root()],
     preset: 'glib',
 )
 

diff --git a/src/PanelWindow.vala b/src/PanelWindow.vala
@@ -45,15 +45,8 @@ public class Wingpanel.PanelWindow : Gtk.Window {
 
         monitor_number = screen.get_primary_monitor ();
 
-        var panel_provider = new Gtk.CssProvider ();
-        panel_provider.load_from_resource ("io/elementary/wingpanel/panel.css");
-
-        var style_context = get_style_context ();
-        style_context.add_class (Widgets.StyleClass.PANEL);
-        style_context.add_provider (panel_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-
         var app_provider = new Gtk.CssProvider ();
-        app_provider.load_from_resource ("io/elementary/wingpanel/application.css");
+        app_provider.load_from_resource ("io/elementary/wingpanel/Application.css");
         Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), app_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         this.screen.size_changed.connect (update_panel_dimensions);
@@ -88,6 +81,8 @@ public class Wingpanel.PanelWindow : Gtk.Window {
 
         key_controller = new Gtk.EventControllerKey (this);
         key_controller.key_pressed.connect (on_key_pressed);
+
+        panel.size_allocate.connect (update_panel_dimensions);
     }
 
     private void on_realize () {

diff --git a/src/Widgets/IndicatorEntry.vala b/src/Widgets/IndicatorEntry.vala
@@ -49,7 +49,7 @@ public class Wingpanel.Widgets.IndicatorEntry : Gtk.MenuItem {
         display_widget = base_indicator.get_display_widget ();
         halign = Gtk.Align.START;
         name = base_indicator.code_name + "/entry";
-        get_style_context ().add_class (StyleClass.COMPOSITED_INDICATOR);
+        get_style_context ().add_class ("composited-indicator");
 
         if (display_widget == null) {
             return;

diff --git a/src/Widgets/IndicatorMenuBar.vala b/src/Widgets/IndicatorMenuBar.vala
@@ -45,7 +45,9 @@ public class Wingpanel.Widgets.IndicatorMenuBar : Gtk.MenuBar {
                 }
             }
 
-            this.insert (item, index);
+            if (item.get_parent () != this) {
+                this.insert (item, index);
+            }
         }
     }