From 3d4577044ee400fc26b0d36ee90d562cf37e969c Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Tue, 1 Apr 2025 16:24:06 +1100
Subject: launcher: add round style

---
 src/config/defaults.ts           | 3 ++-
 src/config/types.ts              | 1 +
 src/modules/launcher/actions.tsx | 4 ++--
 src/modules/launcher/index.tsx   | 9 +++++++--
 src/modules/launcher/modes.tsx   | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/config/defaults.ts b/src/config/defaults.ts
index 5365d86..e933050 100644
--- a/src/config/defaults.ts
+++ b/src/config/defaults.ts
@@ -8,7 +8,7 @@ export default {
     // Modules
     bar: {
         vertical: true,
-        style: "gaps",
+        style: "gaps", // One of "gaps", "panel", "embedded"
         modules: {
             osIcon: {
                 enabled: true,
@@ -49,6 +49,7 @@ export default {
         },
     },
     launcher: {
+        style: "lines", // One of "lines", "round"
         actionPrefix: ">", // Prefix for launcher actions
         apps: {
             maxResults: 30, // Actual max results, -1 for infinite
diff --git a/src/config/types.ts b/src/config/types.ts
index d3215c8..7bea7bf 100644
--- a/src/config/types.ts
+++ b/src/config/types.ts
@@ -25,6 +25,7 @@ export default {
     "bar.modules.dateTime.detailedFormat": STR,
     "bar.modules.power.enabled": BOOL,
     // Launcher
+    "launcher.style": ["lines", "round"],
     "launcher.actionPrefix": STR,
     "launcher.apps.maxResults": NUM,
     "launcher.files.maxResults": NUM,
diff --git a/src/modules/launcher/actions.tsx b/src/modules/launcher/actions.tsx
index 11b07d0..e99c720 100644
--- a/src/modules/launcher/actions.tsx
+++ b/src/modules/launcher/actions.tsx
@@ -304,7 +304,7 @@ const Scheme = ({ scheme, name, colours }: { scheme?: string; name: string; colo
 const Wallpaper = ({ path, thumbnail }: IWallpaper) => (
     <Gtk.FlowBoxChild visible canFocus={false}>
         <button
-            className="result"
+            className="result wallpaper-container"
             cursor="pointer"
             onClicked={() => {
                 execAsync(`caelestia wallpaper -f ${path}`).catch(console.error);
@@ -326,7 +326,7 @@ const Wallpaper = ({ path, thumbnail }: IWallpaper) => (
 const Category = ({ path, wallpapers }: ICategory) => (
     <Gtk.FlowBoxChild visible canFocus={false}>
         <button
-            className="result"
+            className="result wallpaper-container"
             cursor="pointer"
             onClicked={() => {
                 execAsync(`caelestia wallpaper -d ${path}`).catch(console.error);
diff --git a/src/modules/launcher/index.tsx b/src/modules/launcher/index.tsx
index d355c79..b75ecce 100644
--- a/src/modules/launcher/index.tsx
+++ b/src/modules/launcher/index.tsx
@@ -24,7 +24,10 @@ const isAction = (text: string, action: string = "") => text.startsWith(config.a
 
 const SearchBar = ({ mode, entry }: { mode: Variable<Mode>; entry: Widget.Entry }) => (
     <box className="search-bar">
-        <label className="mode" label={bind(mode)} />
+        <box className="mode">
+            <label className="icon" label={bind(mode).as(getModeIcon)} />
+            <label label={bind(mode).as(getPrettyMode)} />
+        </box>
         {entry}
     </box>
 );
@@ -61,6 +64,7 @@ export default class Launcher extends PopupWindow {
         const mode = Variable<Mode>("apps");
         const content = Modes();
         const actions = new Actions(mode, entry);
+        const className = Variable.derive([mode, config.style], (m, s) => `launcher ${m} ${s}`);
 
         super({
             name: "launcher",
@@ -86,7 +90,8 @@ export default class Launcher extends PopupWindow {
                     vertical
                     halign={Gtk.Align.CENTER}
                     valign={Gtk.Align.CENTER}
-                    className={bind(mode).as(m => `launcher ${m}`)}
+                    className={bind(className)}
+                    onDestroy={() => className.drop()}
                 >
                     <SearchBar mode={mode} entry={entry} />
                     <stack
diff --git a/src/modules/launcher/modes.tsx b/src/modules/launcher/modes.tsx
index 0db7cd5..fd9569b 100644
--- a/src/modules/launcher/modes.tsx
+++ b/src/modules/launcher/modes.tsx
@@ -186,7 +186,7 @@ class Math extends Widget.Box implements LauncherContent {
                             />
                         </box>
                     </box>
-                    <box className="separator" />
+                    <box visible={bind(config.style).as(s => s === "lines")} className="separator" />
                 </box>
             </revealer>
         );
-- 
cgit v1.2.3-freya