diff --git a/dots/.config/hypr/hyprland/rules.conf b/dots/.config/hypr/hyprland/rules.conf index 15f47182a..42aa02b64 100644 --- a/dots/.config/hypr/hyprland/rules.conf +++ b/dots/.config/hypr/hyprland/rules.conf @@ -149,6 +149,7 @@ layerrule = noanim, quickshell:polkit layerrule = xray 0, quickshell:popup # No weird color for bar tooltips (this in theory should suffice) layerrule = ignorealpha 1, quickshell:popup # No weird color for bar tooltips (but somehow this is necessary) layerrule = ignorealpha 1, quickshell:mediaControls # Same as above +layerrule = animation slide, quickshell:reloadPopup layerrule = noanim, quickshell:regionSelector layerrule = noanim, quickshell:screenshot layerrule = blur, quickshell:session diff --git a/dots/.config/quickshell/ii/ReloadPopup.qml b/dots/.config/quickshell/ii/ReloadPopup.qml index 4d858ee3e..7a4e7112e 100644 --- a/dots/.config/quickshell/ii/ReloadPopup.qml +++ b/dots/.config/quickshell/ii/ReloadPopup.qml @@ -1,7 +1,8 @@ import QtQuick import QtQuick.Layouts -import Quickshell import Qt5Compat.GraphicalEffects +import Quickshell +import Quickshell.Wayland Scope { id: root @@ -41,6 +42,8 @@ Scope { implicitWidth: rect.width + shadow.radius * 2 implicitHeight: rect.height + shadow.radius * 2 + WlrLayershell.namespace: "quickshell:reloadPopup" + // color blending is a bit odd as detailed in the type reference. color: "transparent" @@ -78,7 +81,7 @@ Scope { Text { renderType: Text.NativeRendering - font.family: "Rubik" + font.family: "Google Sans Flex" font.pointSize: 14 text: root.failed ? "Quickshell: Reload failed" : "Quickshell reloaded" color: failed ? "#ff93000A" : "#ff0C1F13" diff --git a/dots/.config/quickshell/ii/modules/common/widgets/StyledLabel.qml b/dots/.config/quickshell/ii/modules/common/widgets/StyledLabel.qml deleted file mode 100644 index fe790a674..000000000 --- a/dots/.config/quickshell/ii/modules/common/widgets/StyledLabel.qml +++ /dev/null @@ -1,19 +0,0 @@ -import qs.modules.common -import QtQuick -import QtQuick.Controls - -Label { - renderType: Text.NativeRendering - verticalAlignment: Text.AlignVCenter - property bool shouldUseRubik: /^\d+$/.test(root.text) - property var defaultFont: shouldUseRubik ? "Rubik" : Appearance.font.family.main - - font { - hintingPreference: Font.PreferDefaultHinting - family: defaultFont - pixelSize: Appearance?.font.pixelSize.small ?? 15 - variableAxes: shouldUseRubik ? ({}) : Appearance.font.variableAxes.main - } - color: Appearance?.m3colors.m3onBackground ?? "black" - linkColor: Appearance?.m3colors.m3primary -} diff --git a/dots/.config/quickshell/ii/shell.qml b/dots/.config/quickshell/ii/shell.qml index cbe7394c5..756c0a155 100644 --- a/dots/.config/quickshell/ii/shell.qml +++ b/dots/.config/quickshell/ii/shell.qml @@ -69,7 +69,6 @@ ShellRoot { PanelLoader { identifier: "iiOverview"; component: Overview {} } PanelLoader { identifier: "iiPolkit"; component: Polkit {} } PanelLoader { identifier: "iiRegionSelector"; component: RegionSelector {} } - PanelLoader { identifier: "iiReloadPopup"; component: ReloadPopup {} } PanelLoader { identifier: "iiScreenCorners"; component: ScreenCorners {} } PanelLoader { identifier: "iiSessionScreen"; component: SessionScreen {} } PanelLoader { identifier: "iiSidebarLeft"; component: SidebarLeft {} } @@ -79,6 +78,7 @@ ShellRoot { PanelLoader { identifier: "wActionCenter"; component: WaffleActionCenter {} } PanelLoader { identifier: "wBar"; component: WaffleBar {} } PanelLoader { identifier: "wBackground"; component: WaffleBackground {} } + ReloadPopup {} component PanelLoader: LazyLoader { required property string identifier @@ -89,8 +89,8 @@ ShellRoot { // Panel families property list families: ["ii", "waffle"] property var panelFamilies: ({ - "ii": ["iiBar", "iiBackground", "iiCheatsheet", "iiDock", "iiLock", "iiMediaControls", "iiNotificationPopup", "iiOnScreenDisplay", "iiOnScreenKeyboard", "iiOverlay", "iiOverview", "iiPolkit", "iiRegionSelector", "iiReloadPopup", "iiScreenCorners", "iiSessionScreen", "iiSidebarLeft", "iiSidebarRight", "iiVerticalBar", "iiWallpaperSelector"], - "waffle": ["wBar", "wBackground", "wActionCenter", "iiCheatsheet", "iiLock", "iiMediaControls", "iiNotificationPopup", "iiOnScreenDisplay", "iiOnScreenKeyboard", "iiOverlay", "iiOverview", "iiPolkit", "iiRegionSelector", "iiReloadPopup", "iiSessionScreen", "iiSidebarRight", "iiWallpaperSelector"], + "ii": ["iiBar", "iiBackground", "iiCheatsheet", "iiDock", "iiLock", "iiMediaControls", "iiNotificationPopup", "iiOnScreenDisplay", "iiOnScreenKeyboard", "iiOverlay", "iiOverview", "iiPolkit", "iiRegionSelector", "iiScreenCorners", "iiSessionScreen", "iiSidebarLeft", "iiSidebarRight", "iiVerticalBar", "iiWallpaperSelector"], + "waffle": ["wBar", "wBackground", "wActionCenter", "iiCheatsheet", "iiLock", "iiMediaControls", "iiNotificationPopup", "iiOnScreenDisplay", "iiOnScreenKeyboard", "iiOverlay", "iiOverview", "iiPolkit", "iiRegionSelector", "iiSessionScreen", "iiSidebarRight", "iiWallpaperSelector"], }) function cyclePanelFamily() { const currentIndex = families.indexOf(Config.options.panelFamily)