Laucher: Fix wayland warning about focus surface stealing
This commit is contained in:
parent
1599ee5682
commit
7548ffc191
2 changed files with 89 additions and 83 deletions
|
|
@ -174,30 +174,40 @@ NPanel {
|
|||
anchors.margins: Style.marginL * scaling
|
||||
spacing: Style.marginM * scaling
|
||||
|
||||
// Wrapper ensures the input stretches to full width under RowLayout
|
||||
Item {
|
||||
FocusScope {
|
||||
id: searchInputWrap
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: Math.round(Style.barHeight * scaling)
|
||||
|
||||
// Search input
|
||||
// This FocusScope should get focus when panel opens
|
||||
focus: true
|
||||
|
||||
NTextInput {
|
||||
id: searchInput
|
||||
anchors.fill: parent // The NTextInput fills the wrapper
|
||||
Layout.preferredHeight: Style.barHeight * scaling
|
||||
anchors.fill: parent
|
||||
|
||||
// The input should have focus within the scope
|
||||
focus: true
|
||||
|
||||
placeholderText: "Search entries... or use > for commands"
|
||||
text: searchText
|
||||
inputMaxWidth: Number.MAX_SAFE_INTEGER
|
||||
|
||||
function forceActiveFocus() {
|
||||
// First ensure the scope has focus
|
||||
searchInputWrap.forceActiveFocus()
|
||||
// Then focus the actual input
|
||||
if (inputItem && inputItem.visible) {
|
||||
inputItem.forceActiveFocus()
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
if (inputItem) {
|
||||
inputItem.font.pointSize = Style.fontSizeL * scaling
|
||||
inputItem.verticalAlignment = TextInput.AlignVCenter
|
||||
}
|
||||
}
|
||||
|
||||
onTextChanged: searchText = text
|
||||
|
||||
|
|
|
|||
|
|
@ -31,25 +31,22 @@ QtObject {
|
|||
|
||||
// Return available commands when user types ">"
|
||||
function commands() {
|
||||
return [
|
||||
{
|
||||
name: ">clip",
|
||||
description: "Search clipboard history",
|
||||
icon: "content_paste",
|
||||
onActivate: function() {
|
||||
return [{
|
||||
"name": ">clip",
|
||||
"description": "Search clipboard history",
|
||||
"icon": "content_paste",
|
||||
"onActivate": function () {
|
||||
launcher.setSearchText(">clip ")
|
||||
}
|
||||
},
|
||||
{
|
||||
name: ">clip clear",
|
||||
description: "Clear all clipboard history",
|
||||
icon: "delete_sweep",
|
||||
onActivate: function() {
|
||||
}, {
|
||||
"name": ">clip clear",
|
||||
"description": "Clear all clipboard history",
|
||||
"icon": "delete_sweep",
|
||||
"onActivate": function () {
|
||||
CliphistService.wipeAll()
|
||||
launcher.close()
|
||||
}
|
||||
}
|
||||
]
|
||||
}]
|
||||
}
|
||||
|
||||
// Get search results
|
||||
|
|
@ -64,10 +61,10 @@ QtObject {
|
|||
// Special command: clear
|
||||
if (query === "clear") {
|
||||
return [{
|
||||
name: "Clear Clipboard History",
|
||||
description: "Remove all items from clipboard history",
|
||||
icon: "delete_sweep",
|
||||
onActivate: function() {
|
||||
"name": "Clear Clipboard History",
|
||||
"description": "Remove all items from clipboard history",
|
||||
"icon": "delete_sweep",
|
||||
"onActivate": function () {
|
||||
CliphistService.wipeAll()
|
||||
launcher.close()
|
||||
}
|
||||
|
|
@ -110,11 +107,10 @@ QtObject {
|
|||
// Show empty state if no results
|
||||
if (results.length === 0) {
|
||||
results.push({
|
||||
name: searchTerm ? "No matching clipboard items" : "Clipboard is empty",
|
||||
description: searchTerm ? `No items containing "${query}"` : "Copy something to see it here",
|
||||
icon: "content_paste_off",
|
||||
onActivate: function() {
|
||||
// Do nothing
|
||||
"name": searchTerm ? "No matching clipboard items" : "Clipboard is empty",
|
||||
"description": searchTerm ? `No items containing "${query}"` : "Copy something to see it here",
|
||||
"icon": "content_paste_off",
|
||||
"onActivate": function () {// Do nothing
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -127,9 +123,9 @@ QtObject {
|
|||
const meta = parseImageMeta(item.preview)
|
||||
|
||||
return {
|
||||
name: meta ? `Image ${meta.w}×${meta.h}` : "Image",
|
||||
description: meta ? `${meta.fmt} • ${meta.size}` : item.mime || "Image data",
|
||||
icon: "image"
|
||||
"name": meta ? `Image ${meta.w}×${meta.h}` : "Image",
|
||||
"description": meta ? `${meta.fmt} • ${meta.size}` : item.mime || "Image data",
|
||||
"icon": "image"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -158,9 +154,9 @@ QtObject {
|
|||
}
|
||||
|
||||
return {
|
||||
name: title,
|
||||
description: description,
|
||||
icon: "description"
|
||||
"name": title,
|
||||
"description": description,
|
||||
"icon": "description"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -174,10 +170,10 @@ QtObject {
|
|||
}
|
||||
|
||||
return {
|
||||
size: match[1],
|
||||
fmt: (match[2] || "").toUpperCase(),
|
||||
w: Number(match[3]),
|
||||
h: Number(match[4])
|
||||
"size": match[1],
|
||||
"fmt": (match[2] || "").toUpperCase(),
|
||||
"w": Number(match[3]),
|
||||
"h": Number(match[4])
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue