From c26f6141341f01f2b90542df7d6e623ff2e3067a Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Wed, 20 Sep 2023 23:53:01 +0200 Subject: [PATCH 1/6] Utils: Add function to check if running in guest session --- src/Utils.vala | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Utils.vala b/src/Utils.vala index 2149d431f..d8bbff9cf 100644 --- a/src/Utils.vala +++ b/src/Utils.vala @@ -158,4 +158,8 @@ namespace Utils { return false; } + + public static bool is_running_in_guest_mode () { + return Environment.get_user_name ().has_prefix ("guest-"); + } } From 364f007f931d5d09eccc2c736ca662260eae5a84 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Wed, 20 Sep 2023 23:54:25 +0200 Subject: [PATCH 2/6] Client: Prevent cache update if running in guest session --- src/Core/Client.vala | 2 +- src/Utils.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Core/Client.vala b/src/Core/Client.vala index 04ff7f90e..b62fa7342 100644 --- a/src/Core/Client.vala +++ b/src/Core/Client.vala @@ -79,7 +79,7 @@ public class AppCenterCore.Client : Object { public async void update_cache (bool force = false, CacheUpdateType cache_update_type = CacheUpdateType.ALL) { cancellable.reset (); - if (Utils.is_running_in_demo_mode ()) { + if (Utils.is_running_in_demo_mode () || Utils.is_running_in_guest_session ()) { return; } diff --git a/src/Utils.vala b/src/Utils.vala index d8bbff9cf..84b1e8629 100644 --- a/src/Utils.vala +++ b/src/Utils.vala @@ -159,7 +159,7 @@ namespace Utils { return false; } - public static bool is_running_in_guest_mode () { + public static bool is_running_in_guest_session () { return Environment.get_user_name ().has_prefix ("guest-"); } } From a43c4027193c5c815e857a313a7847a8d409dd31 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Tue, 10 Oct 2023 20:47:49 +0200 Subject: [PATCH 3/6] Application: Disable updates button if running in guest session --- src/Application.vala | 1 + src/MainWindow.vala | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Application.vala b/src/Application.vala index b6c102e18..3f788a540 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -146,6 +146,7 @@ public class AppCenter.App : Gtk.Application { client.cache_update_failed.connect (on_cache_update_failed); refresh_action = new SimpleAction ("refresh", null); + refresh_action.set_enabled (!Utils.is_running_in_guest_session ()); refresh_action.activate.connect (() => { client.update_cache.begin (true); }); diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 909e3cb8a..ff5d19473 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -63,7 +63,7 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow { notify["working"].connect (() => { Idle.add (() => { - App.refresh_action.set_enabled (!working); + App.refresh_action.set_enabled (!working && !Utils.is_running_in_guest_session ()); App.repair_action.set_enabled (!working); return GLib.Source.REMOVE; }); From a6978cd9839180eda62e04dd1510e08635560fc7 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Tue, 10 Oct 2023 21:00:02 +0200 Subject: [PATCH 4/6] MainWindow: Hide menu button if running in guest session --- src/MainWindow.vala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index ff5d19473..cef3d84b2 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -188,7 +188,9 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow { title_widget = search_clamp }; headerbar.pack_start (return_button); - headerbar.pack_end (menu_button); + if (!Utils.is_running_in_guest_session ()) { + headerbar.pack_end (menu_button); + } headerbar.pack_end (view_mode_revealer); var homepage = new Homepage (); From a59bba4f6a8dbfefc4720c51b9bb4be9d1482d2a Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sat, 11 Nov 2023 07:47:35 +0100 Subject: [PATCH 5/6] MainWindow: Hide update button --- src/MainWindow.vala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index cef3d84b2..a01e2c98c 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -190,8 +190,10 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow { headerbar.pack_start (return_button); if (!Utils.is_running_in_guest_session ()) { headerbar.pack_end (menu_button); + headerbar.pack_end (view_mode_revealer); + } else { + headerbar.pack_end (new Gtk.Label ("")); } - headerbar.pack_end (view_mode_revealer); var homepage = new Homepage (); installed_view = new Views.AppListUpdateView (); From f396aff888e92c7d4bec8d1961accf22bfa923c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 12 Mar 2024 10:59:52 -0700 Subject: [PATCH 6/6] Add panel min height --- data/styles/MainWindow.scss | 1 + src/MainWindow.vala | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/data/styles/MainWindow.scss b/data/styles/MainWindow.scss index 87d5a8c4c..7eecc5adc 100644 --- a/data/styles/MainWindow.scss +++ b/data/styles/MainWindow.scss @@ -4,6 +4,7 @@ */ .titlebar { + min-height: rem(32px); padding-bottom: rem(3px); padding-top: rem(3px); } diff --git a/src/MainWindow.vala b/src/MainWindow.vala index a01e2c98c..10bbb0bfa 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -191,8 +191,6 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow { if (!Utils.is_running_in_guest_session ()) { headerbar.pack_end (menu_button); headerbar.pack_end (view_mode_revealer); - } else { - headerbar.pack_end (new Gtk.Label ("")); } var homepage = new Homepage ();