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,29 +174,39 @@ 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() {
|
||||
inputItem.forceActiveFocus()
|
||||
// First ensure the scope has focus
|
||||
searchInputWrap.forceActiveFocus()
|
||||
// Then focus the actual input
|
||||
if (inputItem && inputItem.visible) {
|
||||
inputItem.forceActiveFocus()
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
inputItem.font.pointSize = Style.fontSizeL * scaling
|
||||
inputItem.verticalAlignment = TextInput.AlignVCenter
|
||||
if (inputItem) {
|
||||
inputItem.font.pointSize = Style.fontSizeL * scaling
|
||||
inputItem.verticalAlignment = TextInput.AlignVCenter
|
||||
}
|
||||
}
|
||||
|
||||
onTextChanged: searchText = text
|
||||
|
|
|
|||
|
|
@ -5,91 +5,88 @@ import qs.Services
|
|||
|
||||
QtObject {
|
||||
id: root
|
||||
|
||||
|
||||
// Plugin metadata
|
||||
property string name: "Clipboard History"
|
||||
property var launcher: null
|
||||
|
||||
|
||||
// Plugin capabilities
|
||||
property bool handleSearch: false // Don't handle regular search
|
||||
|
||||
property bool handleSearch: false // Don't handle regular search
|
||||
|
||||
// Initialize plugin
|
||||
function init() {
|
||||
Logger.log("ClipboardPlugin", "Initialized")
|
||||
}
|
||||
|
||||
|
||||
// Called when launcher opens
|
||||
function onOpened() {
|
||||
// Refresh clipboard history when launcher opens
|
||||
CliphistService.list(100)
|
||||
}
|
||||
|
||||
|
||||
// Check if this plugin handles the command
|
||||
function handleCommand(searchText) {
|
||||
return searchText.startsWith(">clip")
|
||||
}
|
||||
|
||||
|
||||
// Return available commands when user types ">"
|
||||
function commands() {
|
||||
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() {
|
||||
CliphistService.wipeAll()
|
||||
launcher.close()
|
||||
}
|
||||
}
|
||||
]
|
||||
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 () {
|
||||
CliphistService.wipeAll()
|
||||
launcher.close()
|
||||
}
|
||||
}]
|
||||
}
|
||||
|
||||
|
||||
// Get search results
|
||||
function getResults(searchText) {
|
||||
if (!searchText.startsWith(">clip")) {
|
||||
return []
|
||||
}
|
||||
|
||||
|
||||
const results = []
|
||||
const query = searchText.slice(5).trim()
|
||||
|
||||
|
||||
// Special command: clear
|
||||
if (query === "clear") {
|
||||
return [{
|
||||
name: "Clear Clipboard History",
|
||||
description: "Remove all items from clipboard history",
|
||||
icon: "delete_sweep",
|
||||
onActivate: function() {
|
||||
CliphistService.wipeAll()
|
||||
launcher.close()
|
||||
}
|
||||
}]
|
||||
"name": "Clear Clipboard History",
|
||||
"description": "Remove all items from clipboard history",
|
||||
"icon": "delete_sweep",
|
||||
"onActivate": function () {
|
||||
CliphistService.wipeAll()
|
||||
launcher.close()
|
||||
}
|
||||
}]
|
||||
}
|
||||
|
||||
|
||||
// Search clipboard items
|
||||
const searchTerm = query.toLowerCase()
|
||||
|
||||
|
||||
// Force dependency update
|
||||
const _rev = CliphistService.revision
|
||||
const items = CliphistService.items || []
|
||||
|
||||
|
||||
// Filter and format results
|
||||
items.forEach(function(item) {
|
||||
items.forEach(function (item) {
|
||||
const preview = (item.preview || "").toLowerCase()
|
||||
|
||||
|
||||
// Skip if search term doesn't match
|
||||
if (searchTerm && preview.indexOf(searchTerm) === -1) {
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
// Format the result based on type
|
||||
let entry
|
||||
if (item.isImage) {
|
||||
|
|
@ -97,53 +94,52 @@ QtObject {
|
|||
} else {
|
||||
entry = formatTextEntry(item)
|
||||
}
|
||||
|
||||
|
||||
// Add activation handler
|
||||
entry.onActivate = function() {
|
||||
entry.onActivate = function () {
|
||||
CliphistService.copyToClipboard(item.id)
|
||||
launcher.close()
|
||||
}
|
||||
|
||||
|
||||
results.push(entry)
|
||||
})
|
||||
|
||||
|
||||
// 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
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
return results
|
||||
}
|
||||
|
||||
|
||||
// Helper: Format image clipboard entry
|
||||
function formatImageEntry(item) {
|
||||
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"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Helper: Format text clipboard entry
|
||||
function formatTextEntry(item) {
|
||||
const preview = (item.preview || "").trim()
|
||||
const lines = preview.split('\n').filter(l => l.trim())
|
||||
|
||||
|
||||
// Use first line as title, limit length
|
||||
let title = lines[0] || "Empty text"
|
||||
if (title.length > 60) {
|
||||
title = title.substring(0, 57) + "..."
|
||||
}
|
||||
|
||||
|
||||
// Use second line or character count as description
|
||||
let description = ""
|
||||
if (lines.length > 1) {
|
||||
|
|
@ -156,28 +152,28 @@ QtObject {
|
|||
const words = preview.split(/\s+/).length
|
||||
description = `${chars} characters, ${words} word${words !== 1 ? 's' : ''}`
|
||||
}
|
||||
|
||||
|
||||
return {
|
||||
name: title,
|
||||
description: description,
|
||||
icon: "description"
|
||||
"name": title,
|
||||
"description": description,
|
||||
"icon": "description"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Helper: Parse image metadata from preview string
|
||||
function parseImageMeta(preview) {
|
||||
const re = /\[\[\s*binary data\s+([\d\.]+\s*(?:KiB|MiB|GiB|B))\s+(\w+)\s+(\d+)x(\d+)\s*\]\]/i
|
||||
const match = (preview || "").match(re)
|
||||
|
||||
|
||||
if (!match) {
|
||||
return null
|
||||
}
|
||||
|
||||
|
||||
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