✨ chore: make apps-window and floating notifications work better on gtk4
This commit is contained in:
+44
-40
@@ -6,10 +6,14 @@ import AstalApps from "gi://AstalApps";
|
||||
import Pango from "gi://Pango?version=1.0";
|
||||
import { createState, For } from "ags";
|
||||
|
||||
|
||||
const ignoredKeys = [
|
||||
Gdk.KEY_Right,
|
||||
Gdk.KEY_Down,
|
||||
Gdk.KEY_Up,
|
||||
Gdk.KEY_Shift_L,
|
||||
Gdk.KEY_Shift_R,
|
||||
Gdk.KEY_Shift_Lock,
|
||||
Gdk.KEY_Left,
|
||||
Gdk.KEY_Return,
|
||||
Gdk.KEY_space
|
||||
@@ -18,55 +22,55 @@ const ignoredKeys = [
|
||||
export const AppsWindow = (mon: number) => {
|
||||
const [results, setResults] = createState(getApps() as Array<AstalApps.Application>);
|
||||
|
||||
const entry: Gtk.SearchEntry = <Gtk.SearchEntry onSearchChanged={(self) => {
|
||||
setResults(getAstalApps().fuzzy_query(self.text.trim()));
|
||||
}}/> as Gtk.SearchEntry;
|
||||
|
||||
return <PopupWindow namespace="apps-window" layer={Astal.Layer.OVERLAY}
|
||||
exclusivity={Astal.Exclusivity.IGNORE} monitor={mon} marginTop={64}
|
||||
cssBackgroundWindow="background={rgba(0, 0, 0, .2)"
|
||||
actionKeyPressed={(_, key) => {
|
||||
cssBackgroundWindow="background: rgba(0, 0, 0, .2);"
|
||||
actionKeyPressed={(self, key) => {
|
||||
const entry = self.get_first_child()!.get_first_child()!
|
||||
.get_first_child()!.get_first_child() as Gtk.SearchEntry;
|
||||
|
||||
for(const ignoredKey of ignoredKeys)
|
||||
if(key === ignoredKey) return
|
||||
|
||||
!entry.is_focus && entry.grab_focus();
|
||||
entry.grab_focus();
|
||||
}}>
|
||||
|
||||
<Gtk.Box class={"apps-window-container"} orientation={Gtk.Orientation.VERTICAL}>
|
||||
<Gtk.Box class="apps-area">
|
||||
<Gtk.ScrolledWindow vscrollbarPolicy={Gtk.PolicyType.AUTOMATIC}
|
||||
hscrollbarPolicy={Gtk.PolicyType.NEVER} overlayScrolling={true}
|
||||
propagateNaturalHeight={false}>
|
||||
<Gtk.Box class={"apps-window-container"} orientation={Gtk.Orientation.VERTICAL} hexpand vexpand>
|
||||
<Gtk.SearchEntry onSearchChanged={(self) => {
|
||||
setResults(getAstalApps().fuzzy_query(self.text.trim()));
|
||||
}} />
|
||||
<Gtk.Box class="apps-area" hexpand vexpand>
|
||||
<Gtk.ScrolledWindow vscrollbarPolicy={Gtk.PolicyType.AUTOMATIC}
|
||||
hscrollbarPolicy={Gtk.PolicyType.NEVER} overlayScrolling={true}
|
||||
propagateNaturalHeight={false} hexpand vexpand>
|
||||
|
||||
<Gtk.FlowBox rowSpacing={60} columnSpacing={60}
|
||||
homogeneous={true} visible={true} minChildrenPerLine={1}
|
||||
activateOnSingleClick={true}>
|
||||
|
||||
<For each={results}>
|
||||
{(app) =>
|
||||
<Gtk.Button visible={true} heightRequest={150} tooltipMarkup={
|
||||
`${app.name}${app.description ? `\n<span foreground="#7f7f7f">${
|
||||
app.description}</span>` : ""}`.replace(/\&/g, "&")}
|
||||
<Gtk.FlowBox rowSpacing={60} columnSpacing={60} homogeneous activateOnSingleClick
|
||||
minChildrenPerLine={1}>
|
||||
|
||||
onActivate={() => {
|
||||
execApp(app);
|
||||
window.close();
|
||||
}} onClicked={() => {
|
||||
execApp(app);
|
||||
window.close();
|
||||
}}>
|
||||
|
||||
<Gtk.Box orientation={Gtk.Orientation.VERTICAL}>
|
||||
<Gtk.Image iconName={getAppIcon(app) ?? "application-x-executable"} />
|
||||
<Gtk.Label ellipsize={Pango.EllipsizeMode.END} valign={Gtk.Align.START}
|
||||
label={app.name || "Unnamed App"} />
|
||||
</Gtk.Box>
|
||||
</Gtk.Button>
|
||||
}
|
||||
</For>
|
||||
</Gtk.FlowBox>
|
||||
</Gtk.ScrolledWindow>
|
||||
</Gtk.Box>
|
||||
<For each={results}>
|
||||
{(app) =>
|
||||
<Gtk.Button heightRequest={150} tooltipMarkup={`${app.name}${app.description ?
|
||||
`\n<span foreground="#7f7f7f">${app.description}</span>`
|
||||
: ""}`.replace(/\&/g, "&")
|
||||
} onActivate={() => {
|
||||
execApp(app);
|
||||
window.close();
|
||||
}} onClicked={() => {
|
||||
execApp(app);
|
||||
window.close();
|
||||
}}>
|
||||
<Gtk.Box orientation={Gtk.Orientation.VERTICAL} vexpand>
|
||||
<Gtk.Image iconName={getAppIcon(app) ?? "application-x-executable"}
|
||||
iconSize={Gtk.IconSize.LARGE} vexpand={false} />
|
||||
<Gtk.Label ellipsize={Pango.EllipsizeMode.END} label={app.name}
|
||||
valign={Gtk.Align.END} vexpand />
|
||||
</Gtk.Box>
|
||||
</Gtk.Button>
|
||||
}
|
||||
</For>
|
||||
</Gtk.FlowBox>
|
||||
</Gtk.ScrolledWindow>
|
||||
</Gtk.Box>
|
||||
</Gtk.Box>
|
||||
</PopupWindow>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user