marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

homescreens/folio: Close settings view when home button is pressed

Browse source 
Some of the settings overlays are not windows, and so do not automatically get closed by the home button. Add behaviour for these scenarios.
This commit is contained in:
Devin Lin 2024-07-08 00:08:53 -04:00
parent 1570ac24c8
commit 5f38a74e31
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
containments/homescreens/folio/package/contents/ui/main.qml
View file

@ -86,7 +86,7 @@ ContainmentItem {
}
if (isInWindow) {
// only minimize windows and go to homescreen when not in docked mode
// Only minimize windows and go to homescreen when not in docked mode
if (!ShellSettings.Settings.convergenceModeEnabled) {
folio.HomeScreenState.closeFolder();
folio.HomeScreenState.closeSearchWidget();
@ -95,7 +95,13 @@ ContainmentItem {
WindowPlugin.WindowUtil.minimizeAll();
}
} else { // if we are on the homescreen
// Always ensure settings view is closed
if (folio.HomeScreenState.viewState == Folio.HomeScreenState.SettingsView) {
folio.HomeScreenState.closeSettingsView();
}
} else { // If we are already on the homescreen
switch (folio.HomeScreenState.viewState) {
case Folio.HomeScreenState.PageView:
if (folio.HomeScreenState.currentPage === 0) {
@ -113,6 +119,9 @@ ContainmentItem {
case Folio.HomeScreenState.FolderView:
folio.HomeScreenState.closeFolder();
break;
case Folio.HomeScreenState.SettingsView:
folio.HomeScreenState.closeSettingsView();
break;
}
}
}