From d8a8b6086c70b531b72103b12ca614fc692f5479 Mon Sep 17 00:00:00 2001 From: szecket Date: Tue, 10 Dec 2024 12:33:31 -0500 Subject: [PATCH 1/2] change the icon, recolor and reposition it --- REUSE.toml | 2 ++ tools/lsp/ui/assets/filter.svg | 1 + tools/lsp/ui/components/selection-popup.slint | 9 +++--- tools/lsp/ui/components/styling.slint | 31 +++++-------------- 4 files changed, 16 insertions(+), 27 deletions(-) create mode 100644 tools/lsp/ui/assets/filter.svg diff --git a/REUSE.toml b/REUSE.toml index 97493328c2e..fe5c1e148ad 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -158,6 +158,8 @@ SPDX-License-Identifier = "LicenseRef-qskinny" path = [ "tools/lsp/ui/assets/chevron-down.svg", "tools/lsp/ui/assets/inspect.svg", + "tools/lsp/ui/assets/search.svg", + "tools/lsp/ui/assets/filter.svg", "tools/lsp/ui/assets/layout-sidebar**.svg", "tools/lsp/ui/assets/search.svg", "tools/lsp/ui/assets/sync.svg", diff --git a/tools/lsp/ui/assets/filter.svg b/tools/lsp/ui/assets/filter.svg new file mode 100644 index 00000000000..53343f7188c --- /dev/null +++ b/tools/lsp/ui/assets/filter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tools/lsp/ui/components/selection-popup.slint b/tools/lsp/ui/components/selection-popup.slint index 9dc5649b2c3..1f8a22ab990 100644 --- a/tools/lsp/ui/components/selection-popup.slint +++ b/tools/lsp/ui/components/selection-popup.slint @@ -151,10 +151,11 @@ component PopupInner inherits Rectangle { Rectangle { Image { - source: Icons.search; - colorize: Palette.foreground; - width: EditorSizeSettings.default-icon-width; - height: EditorSizeSettings.default-icon-width; + source: Icons.filter; + colorize: Palette.alternate-foreground; + width: EditorSizeSettings.default-icon-width * 0.8; + height: EditorSizeSettings.default-icon-width * 0.8; + y: filter-edit.height / 2 - self.height / 2; } } diff --git a/tools/lsp/ui/components/styling.slint b/tools/lsp/ui/components/styling.slint index f2985923536..c5434e49559 100644 --- a/tools/lsp/ui/components/styling.slint +++ b/tools/lsp/ui/components/styling.slint @@ -8,6 +8,7 @@ export global Icons { out property chevron-down: @image-url("../assets/chevron-down.svg"); out property inspect: @image-url("../assets/inspect.svg"); out property search: @image-url("../assets/search.svg"); + out property filter: @image-url("../assets/filter.svg"); out property sidebar-left-off: @image-url("../assets/layout-sidebar-left-off.svg"); out property sidebar-right-off: @image-url("../assets/layout-sidebar-right-off.svg"); out property sidebar-left: @image-url("../assets/layout-sidebar-left.svg"); @@ -25,30 +26,14 @@ export global EditorFontSettings { out property regular-font-weight: 400; out property semibold-font-weight: 700; out property bold-font-weight: 900; - - out property header: { - font-size: 18 * 0.0769rem, - font-weight: root.semibold-font-weight - }; - out property body: { - font-size: 14 * 0.0769rem, - font-weight: root.regular-font-weight - }; - out property label: { - font-size: 14 * 0.0769rem, - font-weight: root.regular-font-weight - }; - out property label-sub: { - font-size: 14 * 0.0769rem, - font-weight: root.light-font-weight - }; + out property header: { font-size: 18 * 0.0769rem, font-weight: root.semibold-font-weight }; - - out property body-strong: { - font-size: 16 * 0.0769rem, - font-weight: root.bold-font-weight - }; + out property body: { font-size: 14 * 0.0769rem, font-weight: root.regular-font-weight }; + out property label: { font-size: 14 * 0.0769rem, font-weight: root.regular-font-weight }; + out property label-sub: { font-size: 14 * 0.0769rem, font-weight: root.light-font-weight }; + + out property body-strong: { font-size: 16 * 0.0769rem, font-weight: root.bold-font-weight }; } export global EditorSpaceSettings { @@ -73,7 +58,7 @@ export global EditorSizeSettings { } export global EditorPalette { - + property dark-color-scheme: Palette.color-scheme == ColorScheme.dark; out property drop-mark-background: #00ff0080; From 8aee232fcc2612d3a6632cbbdd31948c36c0bcdf Mon Sep 17 00:00:00 2001 From: szecket Date: Tue, 10 Dec 2024 13:57:49 -0500 Subject: [PATCH 2/2] added filter and removed search duplicate --- REUSE.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/REUSE.toml b/REUSE.toml index fe5c1e148ad..c7591d0fceb 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -157,9 +157,8 @@ SPDX-License-Identifier = "LicenseRef-qskinny" [[annotations]] path = [ "tools/lsp/ui/assets/chevron-down.svg", - "tools/lsp/ui/assets/inspect.svg", - "tools/lsp/ui/assets/search.svg", "tools/lsp/ui/assets/filter.svg", + "tools/lsp/ui/assets/inspect.svg", "tools/lsp/ui/assets/layout-sidebar**.svg", "tools/lsp/ui/assets/search.svg", "tools/lsp/ui/assets/sync.svg",