Skip to content

fix: Uninstalling app in fullscreen doesn't close launcher #549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BLumia merged 1 commit into from
May 7, 2025
Merged

fix: Uninstalling app in fullscreen doesn't close launcher #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions launchercontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,10 @@ void LauncherController::hideWithTimer()
m_pendingHide = true;
return;
}

qDebug() << "hide with timer";
setVisible(false);
if (m_avoidHide) {
qDebug() << "hide with timer";
setVisible(false);
}
}
}

Expand All @@ -183,3 +184,8 @@ void LauncherController::closeAllPopups()
Q_ASSERT(qAppPrivate);
qAppPrivate->closeAllPopups();
}

void LauncherController::setAvoidHide(bool avoidHide)
{
m_avoidHide = avoidHide;
}
2 changes: 2 additions & 0 deletions launchercontroller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class LauncherController : public QObject
void setCurrentFrame(const QString & frame);

Q_INVOKABLE void hideWithTimer();
Q_INVOKABLE void setAvoidHide(bool avoidHide);
Q_INVOKABLE void cancelHide();
Q_INVOKABLE QFont adjustFontWeight(const QFont& f, QFont::Weight weight);

Expand Down Expand Up @@ -81,4 +82,5 @@ class LauncherController : public QObject
bool m_visible;
QString m_currentFrame;
bool m_pendingHide = false;
bool m_avoidHide = true;
};
7 changes: 6 additions & 1 deletion qml/AppItemMenu.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,12 @@ Loader {
enabled: !root.desktopId.startsWith("internal/folders/") && !DesktopIntegration.appIsCompulsoryForDesktop(root.desktopId)
text: qsTr("Uninstall")
onTriggered: {
LauncherController.visible = false
if(LauncherController.currentFrame !== "FullscreenFrame"){
LauncherController.setAvoidHide(true)
LauncherController.visible = false
}else{
LauncherController.setAvoidHide(false)
}
confirmUninstallDlg.appName = root.display
confirmUninstallDlg.appId = root.desktopId
confirmUninstallDlg.icon = root.iconName
Expand Down
10 changes: 10 additions & 0 deletions shell-launcher-applet/package/launcheritem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,16 @@ AppletItem {
minimumHeight: layout.implicitHeight + DStyle.Style.dialogWindow.titleBarHeight
maximumWidth: minimumWidth
maximumHeight: minimumHeight

onVisibleChanged: {
if (!visible) {
LauncherController.setAvoidHide(true)
if (LauncherController.currentFrame === "FullscreenFrame") {
fullscreenFrame.requestActivate()
}
}
}

ColumnLayout {
id: layout
spacing: 0
Expand Down