Skip to content

fix: improve text field focus behavior with context menu #545

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
18202781743 merged 1 commit into from
Oct 28, 2025
Merged

fix: improve text field focus behavior with context menu #545

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 qt6/src/qml/SearchEdit.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.style 1.0 as DS
LineEdit {
id: control
property alias placeholder: centerIndicatorLabel.text
property bool editting: control.activeFocus || (text.length !== 0)
property bool editting: control.activeFocus || control.contextMenuVisible || (text.length !== 0)
leftPadding: (editting) ? searchIcon.width + DS.Style.searchEdit.iconLeftMargin
+ DS.Style.searchEdit.iconRightMargin
: 0
Expand Down
4 changes: 4 additions & 0 deletions qt6/src/qml/TextField.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ T.TextField {
property alias alertText: panel.alertText
property alias alertDuration: panel.alertDuration
property alias showAlert: panel.showAlert
property alias contextMenuVisible: contextMenu.visible

implicitWidth: Math.max(DS.Style.control.implicitWidth(control),
placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding
Expand Down Expand Up @@ -52,6 +53,7 @@ T.TextField {
background: EditPanel {
id: panel
control: control
showBorder: control.activeFocus || control.contextMenuVisible
implicitWidth: DS.Style.edit.width
implicitHeight: DS.Style.edit.textFieldHeight
}
Expand All @@ -74,6 +76,8 @@ T.TextField {

Menu {
id: contextMenu
// Force the text field to keep focus when the context menu is closed
onClosed: control.forceActiveFocus()

MenuItem
{
Expand Down