diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-01-17 00:16:40 +1100 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-01-17 00:16:40 +1100 |
| commit | 0518ec4214583bcc26f5b052f02fd93b12a00a77 (patch) | |
| tree | 0cfac1c39d54a504215a4b98c8be271e66759295 /src/modules/bar.tsx | |
| parent | refactor: move popdowns to own folder (diff) | |
| download | caelestia-shell-0518ec4214583bcc26f5b052f02fd93b12a00a77.tar.gz caelestia-shell-0518ec4214583bcc26f5b052f02fd93b12a00a77.tar.bz2 caelestia-shell-0518ec4214583bcc26f5b052f02fd93b12a00a77.zip | |
bluetoothdevices: make popup window
Diffstat (limited to 'src/modules/bar.tsx')
| -rw-r--r-- | src/modules/bar.tsx | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/src/modules/bar.tsx b/src/modules/bar.tsx index 1bcbc08..0bc4485 100644 --- a/src/modules/bar.tsx +++ b/src/modules/bar.tsx @@ -36,6 +36,14 @@ const hookFocusedClientProp = ( callback(lastClient); }; +const togglePopup = (self: JSX.Element, event: Astal.ClickEvent, name: string) => { + const popup = App.get_window(name) as PopupWindow | null; + if (popup) { + if (popup.visible) popup.hide(); + else popup.popup_at_widget(self, event); + } +}; + const OSIcon = () => <label className="module os-icon" label={osIcon} />; const ActiveWindow = () => ( @@ -315,10 +323,9 @@ const Network = () => ( const Bluetooth = () => ( <button - onClick={(_, event) => { - if (event.button === Astal.MouseButton.PRIMARY) { - // TODO: bluetooth panel - } else if (event.button === Astal.MouseButton.SECONDARY) AstalBluetooth.get_default().toggle(); + onClick={(self, event) => { + if (event.button === Astal.MouseButton.PRIMARY) togglePopup(self, event, "bluetooth-devices"); + else if (event.button === Astal.MouseButton.SECONDARY) AstalBluetooth.get_default().toggle(); else if (event.button === Astal.MouseButton.MIDDLE) execAsync("uwsm app -- blueman-manager").catch(console.error); }} @@ -366,15 +373,7 @@ const StatusIcons = () => ( const PkgUpdates = () => ( <button - onClick={(self, event) => { - if (event.button === Astal.MouseButton.PRIMARY) { - const popup = App.get_window("updates") as PopupWindow | null; - if (popup) { - if (popup.visible) popup.hide(); - else popup.popup_at_widget(self, event); - } - } - }} + onClick={(self, event) => event.button === Astal.MouseButton.PRIMARY && togglePopup(self, event, "updates")} setup={self => setupCustomTooltip( self, @@ -391,15 +390,9 @@ const PkgUpdates = () => ( const NotifCount = () => ( <button - onClick={(self, event) => { - if (event.button === Astal.MouseButton.PRIMARY) { - const popup = App.get_window("notifications") as PopupWindow | null; - if (popup) { - if (popup.visible) popup.hide(); - else popup.popup_at_widget(self, event); - } - } - }} + onClick={(self, event) => + event.button === Astal.MouseButton.PRIMARY && togglePopup(self, event, "notifications") + } setup={self => setupCustomTooltip( self, |