Refactored hooks to specify events and reworked the dropdowns to be significantly faster and more responsive. (#304)
* Updated events to be more specific * Update more events * Update globalmousepos * Update themes and submap module to show submap name. * Type fixes * Reworked menu position calculation logic to be much more efficient. * Revert import file location * We luv arrow functions * Remove globalMousePos remnants since it's unused. * Added the ability to configure menu dropdown transition and duration. * Fix type
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import Gdk from 'gi://Gdk?version=3.0';
|
||||
import { Attribute, Child } from 'lib/types/widget';
|
||||
import { calculateMenuPosition } from 'modules/menus/shared/dropdown/locationHandler/index';
|
||||
import Button from 'types/widgets/button';
|
||||
|
||||
export const closeAllMenus = (): void => {
|
||||
@@ -20,7 +21,7 @@ export const closeAllMenus = (): void => {
|
||||
});
|
||||
};
|
||||
|
||||
export const openMenu = (clicked: Button<Child, Attribute>, event: Gdk.Event, window: string): void => {
|
||||
export const openMenu = async (clicked: Button<Child, Attribute>, event: Gdk.Event, window: string): Promise<void> => {
|
||||
/*
|
||||
* NOTE: We have to make some adjustments so the menu pops up relatively
|
||||
* to the center of the button clicked. We don't want the menu to spawn
|
||||
@@ -44,7 +45,11 @@ export const openMenu = (clicked: Button<Child, Attribute>, event: Gdk.Event, wi
|
||||
const adjustedXCoord = clickPos[1] + middleOffset;
|
||||
const coords = [adjustedXCoord, clickPos[2]];
|
||||
|
||||
globalMousePos.value = coords;
|
||||
try {
|
||||
await calculateMenuPosition(coords, window);
|
||||
} catch (error) {
|
||||
console.error(`Error calculating menu position: ${error}`);
|
||||
}
|
||||
|
||||
closeAllMenus();
|
||||
App.toggleWindow(window);
|
||||
|
||||
@@ -16,9 +16,9 @@ const Workspaces = (monitor = -1): BarBoxChild => {
|
||||
return {
|
||||
component: Widget.Box({
|
||||
class_name: 'workspaces-box-container',
|
||||
child: options.bar.workspaces.hideUnoccupied
|
||||
.bind('value')
|
||||
.as((hideUnoccupied) => (hideUnoccupied ? occupiedWses(monitor) : defaultWses(monitor))),
|
||||
child: options.bar.workspaces.hideUnoccupied.bind('value').as((hideUnoccupied) => {
|
||||
return hideUnoccupied ? occupiedWses(monitor) : defaultWses(monitor);
|
||||
}),
|
||||
}),
|
||||
isVisible: true,
|
||||
boxClass: 'workspaces',
|
||||
|
||||
@@ -44,7 +44,6 @@ export const defaultWses = (monitor: number): BoxWidget => {
|
||||
options.theme.matugen.bind('value'),
|
||||
options.theme.bar.buttons.workspaces.smartHighlight.bind('value'),
|
||||
hyprland.bind('monitors'),
|
||||
hyprland.active.workspace.bind('id'),
|
||||
],
|
||||
(
|
||||
sp: number,
|
||||
@@ -70,7 +69,6 @@ export const defaultWses = (monitor: number): BoxWidget => {
|
||||
hyprland.bind('monitors'),
|
||||
options.bar.workspaces.icons.available.bind('value'),
|
||||
options.bar.workspaces.icons.active.bind('value'),
|
||||
hyprland.active.workspace.bind('id'),
|
||||
],
|
||||
(
|
||||
showIcons: boolean,
|
||||
@@ -102,7 +100,6 @@ export const defaultWses = (monitor: number): BoxWidget => {
|
||||
options.bar.workspaces.showWsIcons.bind('value'),
|
||||
workspaceMask.bind('value'),
|
||||
hyprland.bind('monitors'),
|
||||
hyprland.active.workspace.bind('id'),
|
||||
],
|
||||
(
|
||||
showIcons: boolean,
|
||||
|
||||
@@ -24,7 +24,6 @@ export const occupiedWses = (monitor: number): BoxWidget => {
|
||||
options.bar.workspaces.show_numbered.bind('value'),
|
||||
options.bar.workspaces.numbered_active_indicator.bind('value'),
|
||||
spacing.bind('value'),
|
||||
hyprland.active.workspace.bind('id'),
|
||||
options.bar.workspaces.workspaceIconMap.bind('value'),
|
||||
options.bar.workspaces.showWsIcons.bind('value'),
|
||||
options.theme.matugen.bind('value'),
|
||||
@@ -45,13 +44,13 @@ export const occupiedWses = (monitor: number): BoxWidget => {
|
||||
showNumbered: boolean,
|
||||
numberedActiveIndicator: string,
|
||||
spacing: number,
|
||||
activeId: number,
|
||||
wsIconMap: WorkspaceIconMap,
|
||||
showWsIcons: boolean,
|
||||
matugen: boolean,
|
||||
smartHighlight: boolean,
|
||||
monitors: Monitor[],
|
||||
) => {
|
||||
const activeId = hyprland.active.workspace.id;
|
||||
let allWkspcs = range(totalWkspcs || 8);
|
||||
|
||||
const activeWorkspaces = wkSpaces.map((w) => w.id);
|
||||
@@ -92,13 +91,13 @@ export const occupiedWses = (monitor: number): BoxWidget => {
|
||||
}
|
||||
|
||||
return allWkspcs
|
||||
.filter((workspaceNumber) => {
|
||||
return !isWorkspaceIgnored(ignored, workspaceNumber);
|
||||
})
|
||||
.sort((a, b) => {
|
||||
return a - b;
|
||||
})
|
||||
.map((i, index) => {
|
||||
if (isWorkspaceIgnored(ignored, i)) {
|
||||
return Widget.Box();
|
||||
}
|
||||
return Widget.Button({
|
||||
class_name: 'workspace-button',
|
||||
on_primary_click: () => {
|
||||
|
||||
Reference in New Issue
Block a user