Upgrade to Agsv2 + Astal (#533)
* migrate to astal * Reorganize project structure. * progress * Migrate Dashboard and Window Title modules. * Migrate clock and notification bar modules. * Remove unused code * Media menu * Rework network and volume modules * Finish custom modules. * Migrate battery bar module. * Update battery module and organize helpers. * Migrate workspace module. * Wrap up bar modules. * Checkpoint before I inevitbly blow something up. * Updates * Fix event propagation logic. * Type fixes * More type fixes * Fix padding for event boxes. * Migrate volume menu and refactor scroll event handlers. * network module WIP * Migrate network service. * Migrate bluetooth menu * Updates * Migrate notifications * Update scrolling behavior for custom modules. * Improve popup notifications and add timer functionality. * Migration notifications menu header/controls. * Migrate notifications menu and consolidate notifications menu code. * Migrate power menu. * Dashboard progress * Migrate dashboard * Migrate media menu. * Reduce media menu nesting. * Finish updating media menu bindings to navigate active player. * Migrate battery menu * Consolidate code * Migrate calendar menu * Fix workspace logic to update on client add/change/remove and consolidate code. * Migrate osd * Consolidate hyprland service connections. * Implement startup dropdown menu position allocation. * Migrate settings menu (WIP) * Settings dialo menu fixes * Finish Dashboard menu * Type updates * update submoldule for types * update github ci * ci * Submodule update * Ci updates * Remove type checking for now. * ci fix * Fix a bunch of stuff, losing track... need rest. Brb coffee * Validate dropdown menu before render. * Consolidate code and add auto-hide functionality. * Improve auto-hide behavior. * Consolidate audio menu code * Organize bluetooth code * Improve active player logic * Properly dismiss a notification on action button resolution. * Implement CLI command engine and migrate CLI commands. * Handle variable disposal * Bar component fixes and add hyprland startup rules. * Handle potentially null bindings network and bluetooth bindings. * Handle potentially null wired adapter. * Fix GPU stats * Handle poller for GPU * Fix gpu bar logic. * Clean up logic for stat bars. * Handle wifi and wired bar icon bindings. * Fix battery percentages * Fix switch behavior * Wifi staging fixes * Reduce redundant hyprland service calls. * Code cleanup * Document the option code and reduce redundant calls to optimize performance. * Remove outdated comment. * Add JSDocs * Add meson to build hyprpanel * Consistency updates * Organize commands * Fix images not showing up on notifications. * Remove todo * Move hyprpanel configuration to the ~/.config/hyprpanel directory and add utility commands. * Handle SRC directory for the bundled/built hyprpanel. * Add namespaces to all windows * Migrate systray * systray updates * Update meson to include ts, tsx and scss files. * Remove log from meson * Fix file choose path and make it float. * Added a command to check the dependency status * Update dep names. * Get scale directly from env * Add todo
This commit is contained in:
Jas Singh
GitHub
126
src/components/bar/modules/systray/index.tsx
Normal file
126
src/components/bar/modules/systray/index.tsx
Normal file
@@ -0,0 +1,126 @@
|
||||
import { isMiddleClick, isPrimaryClick, isSecondaryClick, Notify } from '../../../../lib/utils';
|
||||
import options from '../../../../options';
|
||||
import AstalTray from 'gi://AstalTray?version=0.1';
|
||||
import { bind, Gio, Variable } from 'astal';
|
||||
import { BarBoxChild } from 'src/lib/types/bar';
|
||||
import { Gdk, Gtk } from 'astal/gtk3';
|
||||
import { BindableChild } from 'astal/gtk3/astalify';
|
||||
|
||||
const systemtray = AstalTray.get_default();
|
||||
const { ignore, customIcons } = options.bar.systray;
|
||||
|
||||
//TODO: Connect to `notify::menu-model` and `notify::action-group` to have up to date menu and action group
|
||||
const createMenu = (menuModel: Gio.MenuModel, actionGroup: Gio.ActionGroup): Gtk.Menu => {
|
||||
const menu = Gtk.Menu.new_from_model(menuModel);
|
||||
menu.insert_action_group('dbusmenu', actionGroup);
|
||||
|
||||
return menu;
|
||||
};
|
||||
|
||||
const MenuCustomIcon = ({ iconLabel, iconColor, item }: MenuCustomIconProps): JSX.Element => {
|
||||
return (
|
||||
<label
|
||||
className={'systray-icon txt-icon'}
|
||||
label={iconLabel}
|
||||
css={iconColor ? `color: ${iconColor}` : ''}
|
||||
tooltipMarkup={bind(item, 'tooltipMarkup')}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
const MenuDefaultIcon = ({ item }: MenuEntryProps): JSX.Element => {
|
||||
return <icon className={'systray-icon'} gIcon={bind(item, 'gicon')} tooltipMarkup={bind(item, 'tooltipMarkup')} />;
|
||||
};
|
||||
|
||||
const MenuEntry = ({ item, child }: MenuEntryProps): JSX.Element => {
|
||||
const menu = createMenu(item.menuModel, item.actionGroup);
|
||||
|
||||
return (
|
||||
<button
|
||||
cursor={'pointer'}
|
||||
onClick={(self, event) => {
|
||||
if (isPrimaryClick(event)) {
|
||||
item.activate(0, 0);
|
||||
}
|
||||
|
||||
if (isSecondaryClick(event)) {
|
||||
menu?.popup_at_widget(self, Gdk.Gravity.NORTH, Gdk.Gravity.SOUTH, null);
|
||||
}
|
||||
|
||||
if (isMiddleClick(event)) {
|
||||
Notify({ summary: 'App Name', body: item.id });
|
||||
}
|
||||
}}
|
||||
onDestroy={() => menu?.destroy()}
|
||||
>
|
||||
{child}
|
||||
</button>
|
||||
);
|
||||
};
|
||||
|
||||
const SysTray = (): BarBoxChild => {
|
||||
const isVis = Variable(false);
|
||||
|
||||
const componentChildren = Variable.derive(
|
||||
[bind(systemtray, 'items'), bind(ignore), bind(customIcons)],
|
||||
(items, ignored, custIcons) => {
|
||||
const filteredTray = items.filter(({ id }) => !ignored.includes(id) && id !== null);
|
||||
|
||||
isVis.set(filteredTray.length > 0);
|
||||
|
||||
return filteredTray.map((item) => {
|
||||
const matchedCustomIcon = Object.keys(custIcons).find((iconRegex) => item.id.match(iconRegex));
|
||||
|
||||
if (matchedCustomIcon !== undefined) {
|
||||
const iconLabel = custIcons[matchedCustomIcon].icon || '';
|
||||
const iconColor = custIcons[matchedCustomIcon].color;
|
||||
|
||||
return (
|
||||
<MenuEntry item={item}>
|
||||
<MenuCustomIcon iconLabel={iconLabel} iconColor={iconColor} item={item} />
|
||||
</MenuEntry>
|
||||
);
|
||||
}
|
||||
return (
|
||||
<MenuEntry item={item}>
|
||||
<MenuDefaultIcon item={item} />
|
||||
</MenuEntry>
|
||||
);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
const component = (
|
||||
<box
|
||||
className={'systray-container'}
|
||||
onDestroy={() => {
|
||||
isVis.drop();
|
||||
componentChildren.drop();
|
||||
}}
|
||||
>
|
||||
{componentChildren()}
|
||||
</box>
|
||||
);
|
||||
|
||||
return {
|
||||
component,
|
||||
isVisible: true,
|
||||
boxClass: 'systray',
|
||||
isVis,
|
||||
isBox: true,
|
||||
props: {},
|
||||
};
|
||||
};
|
||||
|
||||
interface MenuCustomIconProps {
|
||||
iconLabel: string;
|
||||
iconColor: string;
|
||||
item: AstalTray.TrayItem;
|
||||
}
|
||||
|
||||
interface MenuEntryProps {
|
||||
item: AstalTray.TrayItem;
|
||||
child?: BindableChild;
|
||||
}
|
||||
|
||||
export { SysTray };
|
||||
Reference in New Issue
Block a user