Skip to content

fix: popup has no focus on treeland #903

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
deepin-bot merged 1 commit into from
Nov 27, 2024
Merged

fix: popup has no focus on treeland #903

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
2 changes: 1 addition & 1 deletion frame/qml/PanelMenuWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import QtQuick.Window 2.15
PanelPopupWindow {
id: root

flags: (Qt.platform.pluginName === "xcb" ? Qt.Tool | Qt.X11BypassWindowManagerHint : Qt.ToolTip) | Qt.WindowStaysOnTopHint
flags: Qt.Popup | Qt.WindowStaysOnTopHint
// it's value is useful to distinguish MenuWindow with SubMenuWindow in grabMouse
property QtObject mainMenuWindow
}
3 changes: 1 addition & 2 deletions frame/qml/PanelPopupWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ Window {

width: 10
height: 10
// TODO: it's a qt bug which make Qt.Popup can not get input focus
flags: (Qt.platform.pluginName === "xcb" ? Qt.Tool : Qt.ToolTip) | Qt.WindowStaysOnTopHint
flags: Qt.Popup
D.DWindow.enabled: true
D.DWindow.windowRadius: D.DTK.platformTheme.windowRadius < 0 ? 4 : D.DTK.platformTheme.windowRadius
D.DWindow.enableSystemResize: false
Expand Down
2 changes: 1 addition & 1 deletion frame/qml/PanelToolTipWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.deepin.dtk 1.0 as D
PanelPopupWindow {
id: root

flags: (Qt.platform.pluginName === "xcb" ? Qt.Tool : Qt.ToolTip) | Qt.WindowStaysOnTopHint
flags: Qt.ToolTip | Qt.WindowStaysOnTopHint
D.DWindow.windowRadius: 8
D.DWindow.shadowRadius: 8
}