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

💥 fix(custom-dialog): close popup if closeOnClick is enabled on option

Browse Source
This commit is contained in:
retrozinndev
2025-07-25 23:30:35 -03:00
parent 03b1b64c5c
commit e2b4af1787
2 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ags/widget/CustomDialog.tsx
+36 -45
View File
@@ -3,7 +3,7 @@ import { Windows } from "../windows";
import { PopupWindow } from "./PopupWindow";
import { Separator } from "./Separator";
import { tr } from "../i18n/intl";
import { Accessor, For, With } from "ags";
import { Accessor } from "ags";
import { transformWidget, variableToBoolean, WidgetNodeType } from "../scripts/utils";
@@ -28,58 +28,49 @@ export interface CustomDialogOption {
closeOnClick?: boolean | Accessor<boolean>;
}
function CustomDialogOption({closeOnClick = true, ...props}: CustomDialogOption & { dialog: Astal.Window }) {
function onClicked() {
props.onClick?.();
closeOnClick &&
props.dialog?.close();
}
function CustomDialogOption({closeOnClick = true, ...props}: CustomDialogOption & {
dialog: Astal.Window;
}) {
return <Gtk.Button class="option" hexpand label={props.text}
onClicked={onClicked} onActivate={onClicked}/>
onClicked={() => {
props.onClick?.();
closeOnClick &&
props.dialog?.close();
}}
/>
}
export function CustomDialog({ options = [{ text: tr("accept") }], ...props}: CustomDialogProps) {
return Windows.getDefault().createWindowForFocusedMonitor((mon) =>
<PopupWindow namespace={props.namespace ?? "custom-dialog"} monitor={mon}
return Windows.getDefault().createWindowForFocusedMonitor((mon) => {
const popup = <PopupWindow namespace={props.namespace ?? "custom-dialog"} monitor={mon}
cssBackgroundWindow={props.cssBackground ?? "background: rgba(0, 0, 0, .3);"}
exclusivity={Astal.Exclusivity.IGNORE} layer={Astal.Layer.OVERLAY}
halign={Gtk.Align.CENTER} valign={Gtk.Align.CENTER}
widthRequest={props.widthRequest ?? 400} heightRequest={props.heightRequest ?? 220}
onDestroy={props.onFinish} $={(self) => self.set_child(
halign={Gtk.Align.CENTER} valign={Gtk.Align.CENTER} actionClosed={() => props.onFinish?.()}
widthRequest={props.widthRequest ?? 400} heightRequest={props.heightRequest ?? 220}>
<Gtk.Box class={props.className ?? "custom-dialog-container"}
orientation={Gtk.Orientation.VERTICAL}>
<Gtk.Box class={props.className ?? "custom-dialog-container"}
orientation={Gtk.Orientation.VERTICAL}>
<Gtk.Label class={"title"} visible={variableToBoolean(props.title)} label={props.title} />
<Gtk.Label class={"text"} visible={variableToBoolean(props.text)} label={props.text}
vexpand/>
<Gtk.Box class={"custom-children custom-child"} visible={variableToBoolean(props.children)}
orientation={props.childOrientation ?? Gtk.Orientation.VERTICAL}>
{
(props.children instanceof Accessor) ?
(Array.isArray(props.children) ?
<For each={props.children! as Accessor<Array<JSX.Element>>}>
{(widget) => widget && widget}
</For>
: <With value={props.children as Accessor<JSX.Element>}>
{(widget) => widget && widget}
</With>)
: (Array.isArray(props.children) ?
props.children.map(widget => widget && widget).filter(w => w)
: props.children)
}
</Gtk.Box>
<Separator alpha={.2} visible={options && options.length > 0}
spacing={8} orientation={Gtk.Orientation.VERTICAL} />
<Gtk.Label class={"title"} visible={variableToBoolean(props.title)} label={props.title} />
<Gtk.Label class={"text"} visible={variableToBoolean(props.text)} label={props.text}
vexpand valign={Gtk.Align.START} />
<Gtk.Box class={"custom-children custom-child"} visible={variableToBoolean(props.children)}
orientation={props.childOrientation ?? Gtk.Orientation.VERTICAL}>
{transformWidget(props.children, (child) => child as JSX.Element)}
</Gtk.Box>
<Separator alpha={.2} visible={options && options.length > 0}
spacing={8} orientation={Gtk.Orientation.VERTICAL} />
</Gtk.Box>
</PopupWindow> as Astal.Window;
<Gtk.Box class={"options"} orientation={props.optionsOrientation ?? Gtk.Orientation.HORIZONTAL}
hexpand={true} heightRequest={38} homogeneous={true}>
(popup.get_child()!.get_first_child()!.get_first_child() as Gtk.Box).append(
<Gtk.Box class={"options"} orientation={props.optionsOrientation ?? Gtk.Orientation.HORIZONTAL}
hexpand={true} heightRequest={38} homogeneous={true}>
{transformWidget(options, (props) => <CustomDialogOption {...props} dialog={self} />)}
</Gtk.Box>
</Gtk.Box> as Gtk.Box
)}
/> as Astal.Window
)();
{transformWidget(options, (props) => <CustomDialogOption {...props} dialog={popup} />)}
</Gtk.Box> as Gtk.Box
);
return popup;
})();
}