Merge branch 'main' into lenemter/bg-blur-2

Author: lenemter

daemon/DBus.vala

@@ -164,6 +164,15 @@ public class Gala.Daemon.DBus : GLib.Object {
     }
 
     private void show_menu (Gtk.Popover menu, int display_width, int display_height, int x, int y) {
+        if (!DisplayConfig.is_logical_layout ()) {
+            var scale_factor = window.scale_factor;
+
+            display_width /= scale_factor;
+            display_height /= scale_factor;
+            x /= scale_factor;
+            y /= scale_factor;
+        }
+
         window.default_width = display_width;
         window.default_height = display_height;
         window.present ();

daemon/DisplayConfig.vala

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2024-2025 elementary, Inc. (https://elementary.io)
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+[DBus (name = "org.gnome.Mutter.DisplayConfig")]
+public interface Gala.Daemon.DisplayConfig : Object {
+    private static bool? _is_logical_layout = null;
+    private static DisplayConfig? proxy = null;
+
+    public static bool is_logical_layout () {
+        if (_is_logical_layout == null) {
+            init ();
+        }
+
+        return _is_logical_layout;
+    }
+
+    private static void init () {
+        try {
+            proxy = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.Mutter.DisplayConfig", "/org/gnome/Mutter/DisplayConfig");
+            proxy.monitors_changed.connect (update);
+        } catch (Error e) {
+            critical (e.message);
+            _is_logical_layout = true;
+            return;
+        }
+
+        update ();
+    }
+
+    private static void update () {
+        uint current_serial;
+        MutterReadMonitor[] mutter_monitors;
+        MutterReadLogicalMonitor[] mutter_logical_monitors;
+        GLib.HashTable<string, GLib.Variant> properties;
+        try {
+            proxy.get_current_state (out current_serial, out mutter_monitors, out mutter_logical_monitors, out properties);
+        } catch (Error e) {
+            critical (e.message);
+            _is_logical_layout = true;
+            return;
+        }
+
+        uint layout_mode = 1; // Absence of "layout-mode" means logical (= 1) according to the documentation.
+        var layout_mode_variant = properties.lookup ("layout-mode");
+        if (layout_mode_variant != null) {
+            layout_mode = layout_mode_variant.get_uint32 ();
+        }
+
+        _is_logical_layout = layout_mode == 1;
+    }
+
+    public signal void monitors_changed ();
+    public abstract void get_current_state (out uint serial, out MutterReadMonitor[] monitors, out MutterReadLogicalMonitor[] logical_monitors, out GLib.HashTable<string, GLib.Variant> properties) throws Error;
+}
+
+public struct MutterReadMonitorInfo {
+    public string connector;
+    public string vendor;
+    public string product;
+    public string serial;
+    public uint hash {
+        get {
+            return (connector + vendor + product + serial).hash ();
+        }
+    }
+}
+
+public struct MutterReadMonitorMode {
+    public string id;
+    public int width;
+    public int height;
+    public double frequency;
+    public double preferred_scale;
+    public double[] supported_scales;
+    public GLib.HashTable<string, GLib.Variant> properties;
+}
+
+public struct MutterReadMonitor {
+    public MutterReadMonitorInfo monitor;
+    public MutterReadMonitorMode[] modes;
+    public GLib.HashTable<string, GLib.Variant> properties;
+}
+
+public struct MutterReadLogicalMonitor {
+    public int x;
+    public int y;
+    public double scale;
+    public uint transform;
+    public bool primary;
+    public MutterReadMonitorInfo[] monitors;
+    public GLib.HashTable<string, GLib.Variant> properties;
+}

daemon/meson.build

@@ -1,5 +1,6 @@
 gala_daemon_sources = files(
     'Main.vala',
+    'DisplayConfig.vala',
     'DBus.vala',
     'MonitorLabel.vala',
     'Window.vala',

po/zh_TW.po

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-03-12 22:19+0000\n"
-"PO-Revision-Date: 2024-12-21 09:16+0000\n"
+"PO-Revision-Date: 2025-03-17 11:05+0000\n"
 "Last-Translator: Kisaragi Hiu <[email protected]>\n"
-"Language-Team: Chinese (Traditional Han script) <https://l10n.elementary.io/"
-"projects/desktop/gala/zh_Hant/>\n"
+"Language-Team: Chinese (Traditional Han script) <https://"
+"l10n.elementaryos.org/projects/desktop/gala/zh_Hant/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.8.4\n"
+"X-Generator: Weblate 5.10.2\n"
 "X-Launchpad-Export-Date: 2017-02-21 05:48+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -256,19 +256,19 @@ msgstr "%s 的畫面快照"
 #. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
 #: src/ScreenshotManager.vala:137
 msgid "Show in Files"
-msgstr ""
+msgstr "在《檔案》中顯示"
 
 #: src/ScreenshotManager.vala:143 src/ScreenshotManager.vala:501
 msgid "Screenshot taken"
 msgstr "已拍攝畫面快照"
 
 #: src/ScreenshotManager.vala:144
 msgid "Screenshot is saved to clipboard"
-msgstr ""
+msgstr "畫面快照已儲存到剪貼簿中"
 
 #: src/ScreenshotManager.vala:144
 msgid "Screenshot saved to screenshots folder"
-msgstr ""
+msgstr "畫面快照已儲存到畫面快照資料夾"
 
 #: src/ScreenshotManager.vala:409
 msgid "Screenshots"

src/ShellClients/HideTracker.vala

@@ -302,7 +302,7 @@ public class Gala.HideTracker : Object {
             int.MAX
         );
 
-        barrier.trigger.connect (trigger_show);
+        barrier.trigger.connect (on_barrier_triggered);
     }
 
     private void setup_barrier_bottom (Mtk.Rectangle monitor_geom, int offset) {
@@ -319,6 +319,11 @@ public class Gala.HideTracker : Object {
             int.MAX
         );
 
-        barrier.trigger.connect (trigger_show);
+        barrier.trigger.connect (on_barrier_triggered);
+    }
+
+    private void on_barrier_triggered () {
+        trigger_show ();
+        schedule_update ();
     }
 }