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
178
src/components/bar/modules/workspaces/workspaces.tsx
Normal file
178
src/components/bar/modules/workspaces/workspaces.tsx
Normal file
@@ -0,0 +1,178 @@
|
||||
import { hyprlandService } from 'src/lib/constants/services';
|
||||
import options from 'src/options';
|
||||
import { forceUpdater, getWorkspacesToRender, isWorkspaceIgnored, setupConnections, workspaceRules } from './helpers';
|
||||
import { getAppIcon, getWsColor, renderClassnames, renderLabel } from './helpers/utils';
|
||||
import { ApplicationIcons, WorkspaceIconMap } from 'src/lib/types/workspace';
|
||||
import { bind, Variable } from 'astal';
|
||||
import AstalHyprland from 'gi://AstalHyprland?version=0.1';
|
||||
import { Gtk } from 'astal/gtk3';
|
||||
import { isPrimaryClick } from 'src/lib/utils';
|
||||
|
||||
const {
|
||||
workspaces,
|
||||
monitorSpecific,
|
||||
workspaceMask,
|
||||
spacing,
|
||||
ignored,
|
||||
showAllActive,
|
||||
show_icons,
|
||||
show_numbered,
|
||||
numbered_active_indicator,
|
||||
workspaceIconMap,
|
||||
showWsIcons,
|
||||
showApplicationIcons,
|
||||
applicationIconOncePerWorkspace,
|
||||
applicationIconMap,
|
||||
applicationIconEmptyWorkspace,
|
||||
applicationIconFallback,
|
||||
} = options.bar.workspaces;
|
||||
const { available, active, occupied } = options.bar.workspaces.icons;
|
||||
const { matugen } = options.theme;
|
||||
const { smartHighlight } = options.theme.bar.buttons.workspaces;
|
||||
|
||||
setupConnections();
|
||||
|
||||
export const WorkspaceModule = ({ monitor }: WorkspaceModuleProps): JSX.Element => {
|
||||
const boxChildren = Variable.derive(
|
||||
[
|
||||
bind(monitorSpecific),
|
||||
bind(hyprlandService, 'workspaces'),
|
||||
bind(workspaceMask),
|
||||
bind(workspaces),
|
||||
bind(show_icons),
|
||||
bind(available),
|
||||
bind(active),
|
||||
bind(occupied),
|
||||
bind(show_numbered),
|
||||
bind(numbered_active_indicator),
|
||||
bind(spacing),
|
||||
bind(workspaceIconMap),
|
||||
bind(showWsIcons),
|
||||
bind(showApplicationIcons),
|
||||
bind(applicationIconOncePerWorkspace),
|
||||
bind(applicationIconMap),
|
||||
bind(applicationIconEmptyWorkspace),
|
||||
bind(applicationIconFallback),
|
||||
bind(matugen),
|
||||
bind(smartHighlight),
|
||||
|
||||
bind(hyprlandService, 'monitors'),
|
||||
bind(ignored),
|
||||
bind(showAllActive),
|
||||
bind(hyprlandService, 'focusedWorkspace'),
|
||||
bind(workspaceRules),
|
||||
bind(forceUpdater),
|
||||
],
|
||||
(
|
||||
isMonitorSpecific: boolean,
|
||||
workspaceList: AstalHyprland.Workspace[],
|
||||
workspaceMaskFlag: boolean,
|
||||
totalWorkspaces: number,
|
||||
displayIcons: boolean,
|
||||
availableStatus: string,
|
||||
activeStatus: string,
|
||||
occupiedStatus: string,
|
||||
displayNumbered: boolean,
|
||||
numberedActiveIndicator: string,
|
||||
spacingValue: number,
|
||||
workspaceIconMapping: WorkspaceIconMap,
|
||||
displayWorkspaceIcons: boolean,
|
||||
displayApplicationIcons: boolean,
|
||||
appIconOncePerWorkspace: boolean,
|
||||
applicationIconMapping: ApplicationIcons,
|
||||
applicationIconEmptyWorkspace: string,
|
||||
applicationIconFallback: string,
|
||||
matugenEnabled: boolean,
|
||||
smartHighlightEnabled: boolean,
|
||||
monitorList: AstalHyprland.Monitor[],
|
||||
) => {
|
||||
const activeWorkspace = hyprlandService.focusedWorkspace.id;
|
||||
|
||||
const workspacesToRender = getWorkspacesToRender(
|
||||
totalWorkspaces,
|
||||
workspaceList,
|
||||
workspaceRules.get(),
|
||||
monitor,
|
||||
isMonitorSpecific,
|
||||
monitorList,
|
||||
);
|
||||
|
||||
return workspacesToRender.map((wsId, index) => {
|
||||
if (isWorkspaceIgnored(ignored, wsId)) {
|
||||
return <box />;
|
||||
}
|
||||
|
||||
const appIcons = displayApplicationIcons
|
||||
? getAppIcon(wsId, appIconOncePerWorkspace, {
|
||||
iconMap: applicationIconMapping,
|
||||
defaultIcon: applicationIconFallback,
|
||||
emptyIcon: applicationIconEmptyWorkspace,
|
||||
})
|
||||
: '';
|
||||
|
||||
return (
|
||||
<button
|
||||
className={'workspace-button'}
|
||||
onClick={(_, event) => {
|
||||
if (isPrimaryClick(event)) {
|
||||
hyprlandService.dispatch('workspace', wsId.toString());
|
||||
}
|
||||
}}
|
||||
>
|
||||
<label
|
||||
valign={Gtk.Align.CENTER}
|
||||
css={
|
||||
`margin: 0rem ${0.375 * spacingValue}rem;` +
|
||||
`${displayWorkspaceIcons && !matugenEnabled ? getWsColor(workspaceIconMapping, wsId, smartHighlightEnabled, monitor) : ''}`
|
||||
}
|
||||
className={renderClassnames(
|
||||
displayIcons,
|
||||
displayNumbered,
|
||||
numberedActiveIndicator,
|
||||
displayWorkspaceIcons,
|
||||
smartHighlightEnabled,
|
||||
monitor,
|
||||
wsId,
|
||||
)}
|
||||
label={renderLabel(
|
||||
displayIcons,
|
||||
availableStatus,
|
||||
activeStatus,
|
||||
occupiedStatus,
|
||||
displayApplicationIcons,
|
||||
appIcons,
|
||||
workspaceMaskFlag,
|
||||
displayWorkspaceIcons,
|
||||
workspaceIconMapping,
|
||||
wsId,
|
||||
index,
|
||||
monitor,
|
||||
)}
|
||||
setup={(self) => {
|
||||
self.toggleClassName('active', activeWorkspace === wsId);
|
||||
self.toggleClassName(
|
||||
'occupied',
|
||||
(hyprlandService.get_workspace(wsId)?.get_clients().length || 0) > 0,
|
||||
);
|
||||
}}
|
||||
/>
|
||||
</button>
|
||||
);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
return (
|
||||
<box
|
||||
onDestroy={() => {
|
||||
boxChildren.drop();
|
||||
}}
|
||||
>
|
||||
{boxChildren()}
|
||||
</box>
|
||||
);
|
||||
};
|
||||
|
||||
interface WorkspaceModuleProps {
|
||||
monitor: number;
|
||||
}
|
||||
Reference in New Issue
Block a user