David Heinemeier HanssonandClaude Opus 5.5
24f1243120
* Run menu summon actions in-process A menu action that only summons another shell plugin spawned bash and a qs ipc client to ask this same shell to do it, about 60ms of the path. Call shell.summon directly instead, and fall back to bash when the call is refused or the action is anything more than a bare summon. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Open the theme picker from rows held in the shell Opening the theme picker ran omarchy-theme-switcher to rebuild its index and then made a second IPC call, about 170ms before the picker mapped. The picker now holds the theme rows itself, opens from them at once, and refreshes them behind the open via omarchy-theme-switcher --print-rows. It applies the chosen theme with omarchy-theme-set directly, so omarchy-theme-set no longer preloads the picker. From the keybinding to the overlay mapped drops from ~245ms to ~83ms. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Keep the image picker surface mapped between opens Each open mapped a fresh surface, which rendered its first frames before Hyprland sent its fractional scale: the pixel ratio stepped 2, 1, then 1.6, so the picker flashed blurry for ~130ms and re-uploaded every thumbnail texture. Keep the surface and park it transparent and input-less on the bottom layer while closed, since anything on the overlay layer blocks direct scanout for fullscreen apps. It follows the focused monitor on each open. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
87 lines
4.2 KiB
Bash
87 lines
4.2 KiB
Bash
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
|
|
|
run_node_test <<'JS'
|
|
const fs = require('fs')
|
|
const picker = requireFromRoot('shell/plugins/image-picker/ImagePickerModel.js')
|
|
|
|
assertEqual(picker.nameForPath('/themes/nord-river.png'), 'nord-river', 'image picker strips directory and extension')
|
|
assertEqual(picker.labelForPath('/themes/nord_river.png'), 'Nord River', 'image picker builds display labels')
|
|
|
|
const rows = [
|
|
'/themes/a/nord-river.png\t/cache/nord-river.jpg',
|
|
'/themes/b/nord-river.png\t/cache/duplicate.jpg',
|
|
'/themes/a/gruvbox-dark.jpeg',
|
|
'',
|
|
'\t/cache/no-path.jpg',
|
|
'/themes/a/plain'
|
|
].join('\n')
|
|
|
|
const images = picker.loadRows(rows)
|
|
assertDeepEqual(
|
|
images,
|
|
[
|
|
{ filePath: '/themes/a/nord-river.png', fileName: 'nord-river.png', thumbnailPath: '/cache/nord-river.jpg' },
|
|
{ filePath: '/themes/a/gruvbox-dark.jpeg', fileName: 'gruvbox-dark.jpeg', thumbnailPath: '/themes/a/gruvbox-dark.jpeg' },
|
|
{ filePath: '/themes/a/plain', fileName: 'plain', thumbnailPath: '/themes/a/plain' }
|
|
],
|
|
'image picker parses rows and dedupes by file name'
|
|
)
|
|
|
|
assert(picker.itemMatches(images, 0, 'river'), 'image picker matches file names')
|
|
assert(picker.itemMatches(images, 1, 'Gruvbox Dark'), 'image picker matches labels case-insensitively')
|
|
assert(!picker.itemMatches(images, 2, 'river'), 'image picker rejects non-matching filters')
|
|
assertEqual(picker.firstMatchingIndex(images, 'plain'), 2, 'image picker finds first matching index')
|
|
assertEqual(picker.indexForSelectedImage(images, '/themes/a/gruvbox-dark.jpeg'), 1, 'image picker finds selected image')
|
|
assertEqual(picker.indexForSelectedImage(images, '/missing.png'), 0, 'image picker defaults selected image to first row')
|
|
|
|
assertEqual(picker.filteredPosition(images, 2, 'dark'), 1, 'image picker computes filtered position')
|
|
assertEqual(picker.selectedFilteredPosition(images, 2, 'dark'), 0, 'image picker selected filtered position falls back when selected is hidden')
|
|
assertEqual(picker.nextSelectedIndexForFilter(images, 0, 'dark'), 1, 'image picker moves selection to first match when filter hides current item')
|
|
|
|
const imagePickerQml = fs.readFileSync(path.join(root, 'shell/plugins/image-picker/ImagePicker.qml'), 'utf8')
|
|
assert(
|
|
/function preloadRows[\s\S]*if \(opened \|\| requestActive\) return/.test(imagePickerQml),
|
|
'image picker ignores cache preloads while a request is visible'
|
|
)
|
|
assert(
|
|
/if \(args\.source === "themes"\) \{\s*openThemes\(\)/.test(imagePickerQml) &&
|
|
/function openThemes\(\) \{\s*if \(themeRows\) \{\s*openThemeRows\(\)[\s\S]*refreshThemeRows\(\)/.test(imagePickerQml),
|
|
'image picker opens themes from held rows before refreshing them'
|
|
)
|
|
assert(
|
|
/command: \[root\.omarchyPath \+ "\/bin\/omarchy-theme-switcher", "--print-rows"\]/.test(imagePickerQml),
|
|
'image picker refreshes theme rows from the theme switcher'
|
|
)
|
|
assert(
|
|
/if \(themeMode\) \{[\s\S]*Util\.execArgv\(\["omarchy-theme-set", nameForPath\(path\)\]\)/.test(imagePickerQml),
|
|
'image picker applies a chosen theme itself'
|
|
)
|
|
assert(
|
|
/function cancel\(\) \{\s*themeOpenPending = false/.test(imagePickerQml) &&
|
|
/function closeSelector\(nextDoneFile\) \{\s*requestSerial \+= 1\s*themeOpenPending = false/.test(imagePickerQml),
|
|
'image picker drops a pending theme open once dismissed'
|
|
)
|
|
assert(
|
|
/function openSelector[\s\S]*?themeMode = false/.test(imagePickerQml),
|
|
'image picker leaves theme mode when another caller opens it'
|
|
)
|
|
assert(
|
|
/PanelWindow \{[\s\S]*?visible: true[\s\S]*?mask: root\.opened \? null : closedMask[\s\S]*?WlrLayershell\.layer: root\.opened \? WlrLayer\.Overlay : WlrLayer\.Bottom/.test(imagePickerQml) &&
|
|
/Region \{ id: closedMask \}/.test(imagePickerQml),
|
|
'image picker keeps its surface mapped, parked input-less below windows while closed'
|
|
)
|
|
assert(
|
|
/function openSelector[\s\S]*?targetScreen = focusedScreen\(\) \|\| targetScreen/.test(imagePickerQml) &&
|
|
/screen: root\.targetScreen/.test(imagePickerQml),
|
|
'image picker follows the focused monitor on each open'
|
|
)
|
|
assert(
|
|
/source: item\.sourceActivated && item\.thumbnailPath \? Util\.fileUrl\(item\.thumbnailPath\) : ""[\s\S]*asynchronous: false/.test(imagePickerQml),
|
|
'image picker loads activated thumbnails synchronously to avoid carousel flicker'
|
|
)
|
|
JS
|