Olivier/colorshell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

💥 ags: fix startup issues (and with that, errors with focusedClient bar widget)

Browse Source
This commit is contained in:
retrozinndev
2025-02-04 21:45:18 -03:00
parent 11f919ab1d
commit 80969071c4
21 changed files with 363 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ags/widget/bar/Audio.tsx → ags/widget/bar/Audio.ts
+15 -4
View File
@@ -1,16 +1,22 @@
import { bind } from "astal";
import { Gtk, Widget } from "astal/gtk3";
import { Astal, Widget } from "astal/gtk3";
import AstalWp from "gi://AstalWp?version=0.1";
import { Wireplumber } from "../../scripts/volume";
const wp = AstalWp.get_default();
export function Audio() {
return wp && new Widget.Button({
return wp && new Widget.EventBox({
className: "audio",
child: new Widget.Box({
children: [
new Widget.EventBox({
className: "sink",
onScroll: (_, event) =>
event.delta_y > 0 ?
Wireplumber.getDefault().decreaseSinkVolume(5)
:
Wireplumber.getDefault().increaseSinkVolume(5),
child: new Widget.Box({
children: [
new Widget.Label({
@@ -22,11 +28,16 @@ export function Audio() {
label: bind(wp!.defaultSpeaker, "volume").as((volume: number) =>
Math.round(volume * 100).toString() + "%")
} as Widget.LabelProps)
]
]
})
} as Widget.EventBoxProps),
new Widget.EventBox({
className: "source",
onScroll: (_, event) =>
event.delta_y > 0 ?
Wireplumber.getDefault().decreaseSourceVolume(5)
:
Wireplumber.getDefault().increaseSourceVolume(5),
child: new Widget.Box({
children: [
new Widget.Label({
@@ -42,5 +53,5 @@ export function Audio() {
} as Widget.EventBoxProps)
]
} as Widget.BoxProps)
} as Widget.ButtonProps);
} as Widget.EventBoxProps);
}
ags/widget/bar/Clock.tsx → ags/widget/bar/Clock.ts
View File
ags/widget/bar/FocusedWindow.tsx → ags/widget/bar/FocusedWindow.ts
+7 -3
View File
@@ -13,7 +13,11 @@ export function FocusedWindow() {
new Widget.Icon({
className: "icon",
icon: bind(hyprland, "focusedClient").as((client: AstalHyprland.Client) =>
getAppIcon(client.initialClass) || "image-missing"),
client ?
(getAppIcon(client.initialClass) || client.initialClass)
:
"image-missing"
),
iconSize: Gtk.IconSize.SMALL_TOOLBAR
}),
new Widget.Box({
@@ -25,13 +29,13 @@ export function FocusedWindow() {
className: "class",
xalign: 0,
label: bind(hyprland, "focusedClient").as((client: AstalHyprland.Client) =>
client?.["class"])
client ? client.class : "")
} as Widget.LabelProps),
new Widget.Label({
className: "title",
xalign: 0,
label: bind(hyprland, "focusedClient").as((client: AstalHyprland.Client) =>
client?.["title"])
client ? client.title : "")
} as Widget.LabelProps)
]
})
ags/widget/bar/Media.tsx → ags/widget/bar/Media.ts
View File
ags/widget/bar/Tray.tsx → ags/widget/bar/Tray.ts
View File
ags/widget/bar/Workspaces.tsx → ags/widget/bar/Workspaces.ts
View File
ags/widget/control-center/ButtonGrid.ts
-30
View File
@@ -1,30 +0,0 @@
import { Gtk, Widget } from "astal/gtk3";
export function ButtonGrid(): Widget.Box {
return new Widget.Box({
child: new Gtk.Grid({
orientation: Gtk.Orientation.HORIZONTAL,
rowHomogeneous: true
} as Gtk.Grid.ConstructorProps, BluetoothToggle())
} as Widget.BoxProps);
}
// Buttons and Toggles!
export function BluetoothToggle(): Gtk.ToggleButton {
return new Gtk.ToggleButton({
child: new Widget.Box({
orientation: Gtk.Orientation.VERTICAL,
children: [
new Widget.Label({
className: "title",
label: "Bluetooth"
} as Widget.LabelProps),
new Widget.Label({
className: "extra",
label: "[dev] [dev_bat]"
} as Widget.LabelProps)
]
} as Widget.BoxProps)
});
}
ags/widget/control-center/QuickActions.ts
+36 -39
View File
@@ -8,45 +8,6 @@ const uptime = new Variable<string>("Just turned on")
return Process.exec("uptime -p").replace(/^up /, "")
})();
const quickActionsBox: Widget.Box = new Widget.Box({
className: "quickactions",
hexpand: true,
children: [
new Widget.Box({
orientation: Gtk.Orientation.VERTICAL,
halign: Gtk.Align.START,
children: [
new Widget.Label({
className: "hostname",
xalign: 0,
label: hostname.toString()
} as Widget.LabelProps),
new Widget.Label({
className: "uptime",
xalign: 0,
label: uptime.as((uptime: string) => `󱡢 ${uptime}`)
} as Widget.LabelProps)
]
} as Widget.BoxProps),
new Widget.Box({
orientation: Gtk.Orientation.HORIZONTAL,
className: "button-row",
halign: Gtk.Align.END,
children: [
LockButton(),
ColorPickerButton(),
ScreenshotButton(),
SelectWallpaperButton(),
LogoutButton()
]
} as Widget.BoxProps)
]
} as Widget.BoxProps);
export function QuickActionsWidget(): Widget.Box {
return quickActionsBox;
}
function LockButton(): Widget.Button {
return new Widget.Button({
label: "󰌾",
@@ -93,3 +54,39 @@ function LogoutButton(): Widget.Button {
)
} as Widget.ButtonProps);
}
export const QuickActions: Widget.Box = new Widget.Box({
className: "quickactions",
children: [
new Widget.Box({
orientation: Gtk.Orientation.VERTICAL,
halign: Gtk.Align.START,
hexpand: true,
children: [
new Widget.Label({
className: "hostname",
xalign: 0,
label: hostname.toString()
} as Widget.LabelProps),
new Widget.Label({
className: "uptime",
xalign: 0,
label: uptime.as((uptime: string) => `󱡢 ${uptime}`)
} as Widget.LabelProps)
]
} as Widget.BoxProps),
new Widget.Box({
orientation: Gtk.Orientation.HORIZONTAL,
className: "button-row",
halign: Gtk.Align.END,
hexpand: true,
children: [
LockButton(),
ColorPickerButton(),
ScreenshotButton(),
SelectWallpaperButton(),
LogoutButton()
]
} as Widget.BoxProps)
]
} as Widget.BoxProps);
ags/widget/control-center/Tiles.ts
+11
View File
@@ -0,0 +1,11 @@
import { Gtk, Widget } from "astal/gtk3";
export const tileList: Array<Gtk.Widget> = [
]
export const Tiles: Widget.Box = new Widget.Box({
child: new Gtk.Grid({
orientation: Gtk.Orientation.HORIZONTAL,
rowHomogeneous: true
} as Gtk.Grid.ConstructorProps)
} as Widget.BoxProps);
ags/widget/control-center/tiles/Internet.ts
+8
View File
@@ -0,0 +1,8 @@
import { Gtk, Widget } from "astal/gtk3";
export const TileInternet = new Widget.Box({
className: "tile more internet",
children: [
toggleButton
]
} as Widget.BoxProps);
ags/widget/control-center/tiles/MoreTile.ts
+60
View File
@@ -0,0 +1,60 @@
import { Binding } from "astal";
import { Gtk, Widget } from "astal/gtk3";
export interface MoreTileProps {
className?: string | Binding<string | undefined>;
iconName?: string | Binding<string | undefined>;
iconSize?: Gtk.IconSize;
title: string | Binding<string>;
description?: string | Binding<string | undefined>;
defaultToggleState?: boolean;
onToggledOn: Function;
onToggledOff: Function;
onClickMore: Function;
}
export function MoreTile(props: MoreTileProps): Gtk.Widget {
let toggleState: boolean = props?.defaultToggleState !== undefined ?
props.defaultToggleState : false;
const mainEventBox = new Widget.EventBox({
onClick: () => toggleState ? props.onToggledOff() : props.onToggledOn(),
expand: true,
child: new Widget.Box({
className: props?.className || "",
expand: true,
children: [
new Widget.Icon({
iconName: props?.iconName,
visible: props.iconName !== undefined,
iconSize: props.iconSize || Gtk.IconSize.BUTTON
}),
new Widget.Box({
className: "text",
orientation: Gtk.Orientation.VERTICAL,
children: [
new Widget.Label({
className: "title",
label: props.title
} as Widget.LabelProps),
new Widget.Label({
className: "description",
visible: props?.description !== undefined,
label: props?.description
} as Widget.LabelProps)
]
} as Widget.BoxProps),
new Widget.Button({
onClick: () => props.onClickMore(),
child: new Widget.Icon({
iconName: "go-next",
iconSize: Gtk.IconSize.BUTTON
} as Widget.IconProps),
} as Widget.ButtonProps)
]
} as Widget.BoxProps)
} as Widget.EventBoxProps);
return mainEventBox;
}
ags/widget/control-center/tiles/NormalTile.ts
+61
View File
@@ -0,0 +1,61 @@
import { Binding } from "astal";
import { Gtk, Widget } from "astal/gtk3";
export interface NormalTileProps {
className?: string | Binding<string | undefined>;
iconName?: string | Binding<string | undefined>;
iconSize?: Gtk.IconSize;
title: string | Binding<string>;
description?: string | Binding<string | undefined>;
toggleState?: boolean | Binding<boolean | undefined>;
onToggledOn: Function;
onToggledOff: Function;
}
export function MoreTile(props: NormalTileProps): Gtk.Widget {
let toggleState: boolean = props?.toggleState !== undefined ?
props.toggleState : false;
const mainEventBox = new Widget.EventBox({
onClick: () => toggleState ? props.onToggledOff() : props.onToggledOn(),
expand: true,
child: new Widget.Box({
className: props?.className || "",
expand: true,
children: [
new Widget.Icon({
iconName: props?.iconName,
visible: props.iconName !== undefined,
iconSize: props.iconSize || Gtk.IconSize.BUTTON
}),
new Widget.Box({
className: "text",
orientation: Gtk.Orientation.VERTICAL,
children: [
new Widget.Label({
className: "title",
label: props.title
} as Widget.LabelProps),
new Widget.Label({
className: "description",
visible: props?.description !== undefined,
label: props?.description
} as Widget.LabelProps)
]
} as Widget.BoxProps)
]
} as Widget.BoxProps)
} as Widget.EventBoxProps);
function toggleOn(): void {
mainEventBox.set_class_name(mainEventBox + "")
props.onToggledOn();
}
function toggleOff(): void {
props.onToggledOff();
}
return mainEventBox;
}