From 2171d3bc8e0d2b8c9ff6baea84270fa5748d0cf4 Mon Sep 17 00:00:00 2001 From: Leonhard Kargl Date: Wed, 14 Aug 2024 22:47:11 +0200 Subject: [PATCH 1/5] Access/Dialog: Center and keep above on wayland --- meson.build | 1 + src/Access/Dialog.vala | 8 +++++++- src/meson.build | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 629fc356..6d831244 100644 --- a/meson.build +++ b/meson.build @@ -26,6 +26,7 @@ if meson.get_compiler('vala').version().version_compare('>=0.56.1') ] endif +pantheon_wayland_dep = dependency('pantheon-wayland-1') x11_dep = dependency('x11') add_project_arguments( diff --git a/src/Access/Dialog.vala b/src/Access/Dialog.vala index 0c54fe6a..a57d76cc 100644 --- a/src/Access/Dialog.vala +++ b/src/Access/Dialog.vala @@ -4,7 +4,7 @@ */ [DBus (name = "org.freedesktop.impl.portal.Request")] -public class Access.Dialog : Granite.MessageDialog { +public class Access.Dialog : Granite.MessageDialog, PantheonWayland.ExtendedBehavior { public enum ButtonAction { SUGGESTED, DESTRUCTIVE @@ -73,6 +73,12 @@ public class Access.Dialog : Granite.MessageDialog { custom_bin.orientation = Gtk.Orientation.VERTICAL; custom_bin.spacing = 6; + + child.realize.connect (() => { + connect_to_shell (); + make_centered (); + set_keep_above (); + }); } public override void show () { diff --git a/src/meson.build b/src/meson.build index c17ab23e..f995b995 100644 --- a/src/meson.build +++ b/src/meson.build @@ -29,6 +29,7 @@ executable( gio_dep, granite_dep, gtk_deps, + pantheon_wayland_dep, x11_dep ], install: true, From b2579cef2bb6069b2ca2a552dd39cd0af4b59088 Mon Sep 17 00:00:00 2001 From: Leonhard Kargl Date: Wed, 14 Aug 2024 23:48:09 +0200 Subject: [PATCH 2/5] Only center and above without parent --- src/Access/Dialog.vala | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Access/Dialog.vala b/src/Access/Dialog.vala index a57d76cc..d438c66d 100644 --- a/src/Access/Dialog.vala +++ b/src/Access/Dialog.vala @@ -74,11 +74,13 @@ public class Access.Dialog : Granite.MessageDialog, PantheonWayland.ExtendedBeha custom_bin.orientation = Gtk.Orientation.VERTICAL; custom_bin.spacing = 6; - child.realize.connect (() => { - connect_to_shell (); - make_centered (); - set_keep_above (); - }); + if (parent_window == "") { + child.realize.connect (() => { + connect_to_shell (); + make_centered (); + set_keep_above (); + }); + } } public override void show () { From e0b1e1fdcfcf9448d0bb86101d52219dee1fb04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 15 Aug 2024 14:24:03 -0700 Subject: [PATCH 3/5] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 923eccf8..dfe8f5d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - name: Install Dependencies run: | apt update - apt install -y libgranite-7-dev libgtk-4-dev meson valac + apt install -y libgranite-7-dev libgtk-4-dev libpantheon-wayland-1-dev meson valac - name: Build run: | meson build From a2500b1c779a8eebedfb8fdcb1336c59f0040de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 15 Aug 2024 16:23:37 -0700 Subject: [PATCH 4/5] Update portals.metainfo.xml.in --- data/portals.metainfo.xml.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/portals.metainfo.xml.in b/data/portals.metainfo.xml.in index 4e00c7ff..4d4e05c9 100644 --- a/data/portals.metainfo.xml.in +++ b/data/portals.metainfo.xml.in @@ -26,6 +26,18 @@ contact_at_elementary.io + + +

New Features:

+
    +
  • Updated translations
  • +
+
+ + Center and Keep on Top display settings dialog + +
+

New Features:

From 29226068684c65a85aabedad8cb0415ade79e734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 15 Aug 2024 16:25:57 -0700 Subject: [PATCH 5/5] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 75541c9a..3ff8de5e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,4 +25,4 @@ jobs: GIT_USER_NAME: "elementaryBot" GIT_USER_EMAIL: "builds@elementary.io" with: - release_branch: 'horus' + release_branch: 'noble'