kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

use shared focusgrab for most stuff (makes osk usable w/ other panels)

Browse Source
This commit is contained in:
end-4
2026-01-01 16:36:50 +01:00
parent 171cf6059f
commit 7238b2b15c
10 changed files with 168 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dots/.config/quickshell/ii/modules/ii/bar/Bar.qml
+11
View File
@@ -1,3 +1,5 @@
pragma ComponentBehavior: Bound
import QtQuick import QtQuick
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io
@@ -60,6 +62,7 @@ Scope {
} }
color: "transparent" color: "transparent"
// Positioning
anchors { anchors {
top: !Config.options.bar.bottom top: !Config.options.bar.bottom
bottom: Config.options.bar.bottom bottom: Config.options.bar.bottom
@@ -72,6 +75,14 @@ Scope {
bottom: (Config.options.interactions.deadPixelWorkaround.enable && barRoot.anchors.bottom) * -1 bottom: (Config.options.interactions.deadPixelWorkaround.enable && barRoot.anchors.bottom) * -1
} }
// Include in focus grab
Component.onCompleted: {
GlobalFocusGrab.addPersistent(barRoot);
}
Component.onDestruction: {
GlobalFocusGrab.removePersistent(barRoot);
}
MouseArea { MouseArea {
id: hoverRegion id: hoverRegion
hoverEnabled: true hoverEnabled: true
dots/.config/quickshell/ii/modules/ii/cheatsheet/Cheatsheet.qml
+10 -7
View File
@@ -54,13 +54,16 @@ Scope { // Scope
item: cheatsheetBackground item: cheatsheetBackground
} }
HyprlandFocusGrab { // Click outside to close Component.onCompleted: {
id: grab GlobalFocusGrab.addDismissable(cheatsheetRoot);
windows: [cheatsheetRoot] }
active: cheatsheetRoot.visible Component.onDestruction: {
onCleared: () => { GlobalFocusGrab.removeDismissable(cheatsheetRoot);
if (!active) }
cheatsheetRoot.hide(); Connections {
target: GlobalFocusGrab
function onDismissed() {
cheatsheetRoot.hide();
} }
} }
dots/.config/quickshell/ii/modules/ii/mediaControls/MediaControls.qml
+20 -14
View File
@@ -81,7 +81,7 @@ Scope {
} }
sourceComponent: PanelWindow { sourceComponent: PanelWindow {
id: mediaControlsRoot id: panelWindow
visible: true visible: true
exclusionMode: ExclusionMode.Ignore exclusionMode: ExclusionMode.Ignore
@@ -98,9 +98,9 @@ Scope {
right: Config.options.bar.vertical && Config.options.bar.bottom right: Config.options.bar.vertical && Config.options.bar.bottom
} }
margins { margins {
top: Config.options.bar.vertical ? ((mediaControlsRoot.screen.height / 2) - widgetHeight * 1.5) : Appearance.sizes.barHeight top: Config.options.bar.vertical ? ((panelWindow.screen.height / 2) - widgetHeight * 1.5) : Appearance.sizes.barHeight
bottom: Appearance.sizes.barHeight bottom: Appearance.sizes.barHeight
left: Config.options.bar.vertical ? Appearance.sizes.barHeight : ((mediaControlsRoot.screen.width / 2) - (osdWidth / 2) - widgetWidth) left: Config.options.bar.vertical ? Appearance.sizes.barHeight : ((panelWindow.screen.width / 2) - (osdWidth / 2) - widgetWidth)
right: Appearance.sizes.barHeight right: Appearance.sizes.barHeight
} }
@@ -108,13 +108,16 @@ Scope {
item: playerColumnLayout item: playerColumnLayout
} }
HyprlandFocusGrab { Component.onCompleted: {
windows: [mediaControlsRoot] GlobalFocusGrab.addDismissable(panelWindow);
active: mediaControlsLoader.active }
onCleared: () => { Component.onDestruction: {
if (!active) { GlobalFocusGrab.removeDismissable(panelWindow);
GlobalStates.mediaControlsOpen = false; }
} Connections {
target: GlobalFocusGrab
function onDismissed() {
GlobalStates.mediaControlsOpen = false;
} }
} }
@@ -137,10 +140,13 @@ Scope {
} }
} }
Item { // No player placeholder Item {
// No player placeholder
Layout.alignment: { Layout.alignment: {
if (mediaControlsRoot.anchors.left) return Qt.AlignLeft; if (panelWindow.anchors.left)
if (mediaControlsRoot.anchors.right) return Qt.AlignRight; return Qt.AlignLeft;
if (panelWindow.anchors.right)
return Qt.AlignRight;
return Qt.AlignHCenter; return Qt.AlignHCenter;
} }
Layout.leftMargin: Appearance.sizes.hyprlandGapsOut Layout.leftMargin: Appearance.sizes.hyprlandGapsOut
@@ -153,7 +159,7 @@ Scope {
target: placeholderBackground target: placeholderBackground
} }
Rectangle { Rectangle {
id: placeholderBackground id: placeholderBackground
anchors.centerIn: parent anchors.centerIn: parent
color: Appearance.colors.colLayer0 color: Appearance.colors.colLayer0
dots/.config/quickshell/ii/modules/ii/onScreenKeyboard/OnScreenKeyboard.qml
+7
View File
@@ -57,6 +57,13 @@ Scope { // Scope
item: oskBackground item: oskBackground
} }
// Make it usable with other panels
Component.onCompleted: {
GlobalFocusGrab.addPersistent(oskRoot);
}
Component.onDestruction: {
GlobalFocusGrab.removePersistent(oskRoot);
}
// Background // Background
StyledRectangularShadow { StyledRectangularShadow {
dots/.config/quickshell/ii/modules/ii/overview/Overview.qml
+7 -22
View File
@@ -23,7 +23,7 @@ Scope {
visible: GlobalStates.overviewOpen visible: GlobalStates.overviewOpen
WlrLayershell.namespace: "quickshell:overview" WlrLayershell.namespace: "quickshell:overview"
WlrLayershell.layer: WlrLayer.Overlay WlrLayershell.layer: WlrLayer.Top
// WlrLayershell.keyboardFocus: GlobalStates.overviewOpen ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None // WlrLayershell.keyboardFocus: GlobalStates.overviewOpen ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
color: "transparent" color: "transparent"
@@ -38,43 +38,28 @@ Scope {
right: true right: true
} }
HyprlandFocusGrab {
id: grab
windows: [panelWindow]
property bool canBeActive: panelWindow.monitorIsFocused
active: false
onCleared: () => {
if (!active)
GlobalStates.overviewOpen = false;
}
}
Connections { Connections {
target: GlobalStates target: GlobalStates
function onOverviewOpenChanged() { function onOverviewOpenChanged() {
if (!GlobalStates.overviewOpen) { if (!GlobalStates.overviewOpen) {
searchWidget.disableExpandAnimation(); searchWidget.disableExpandAnimation();
overviewScope.dontAutoCancelSearch = false; overviewScope.dontAutoCancelSearch = false;
GlobalFocusGrab.dismiss();
} else { } else {
if (!overviewScope.dontAutoCancelSearch) { if (!overviewScope.dontAutoCancelSearch) {
searchWidget.cancelSearch(); searchWidget.cancelSearch();
} }
delayedGrabTimer.start(); GlobalFocusGrab.addDismissable(panelWindow);
} }
} }
} }
Timer { Connections {
id: delayedGrabTimer target: GlobalFocusGrab
interval: Config.options.hacks.arbitraryRaceConditionDelay function onDismissed() {
repeat: false GlobalStates.overviewOpen = false;
onTriggered: {
if (!grab.canBeActive)
return;
grab.active = GlobalStates.overviewOpen;
} }
} }
implicitWidth: columnLayout.implicitWidth implicitWidth: columnLayout.implicitWidth
implicitHeight: columnLayout.implicitHeight implicitHeight: columnLayout.implicitHeight
dots/.config/quickshell/ii/modules/ii/sidebarLeft/SidebarLeft.qml
+15 -13
View File
@@ -84,11 +84,11 @@ Scope { // Scope
active: true active: true
sourceComponent: PanelWindow { // Window sourceComponent: PanelWindow { // Window
id: sidebarRoot id: panelWindow
visible: GlobalStates.sidebarLeftOpen visible: GlobalStates.sidebarLeftOpen
property bool extend: false property bool extend: false
property real sidebarWidth: sidebarRoot.extend ? Appearance.sizes.sidebarWidthExtended : Appearance.sizes.sidebarWidth property real sidebarWidth: panelWindow.extend ? Appearance.sizes.sidebarWidthExtended : Appearance.sizes.sidebarWidth
property var contentParent: sidebarLeftBackground property var contentParent: sidebarLeftBackground
function hide() { function hide() {
@@ -113,15 +113,17 @@ Scope { // Scope
item: sidebarLeftBackground item: sidebarLeftBackground
} }
HyprlandFocusGrab { // Click outside to close onVisibleChanged: {
id: grab if (visible) {
windows: [ sidebarRoot ] GlobalFocusGrab.addDismissable(panelWindow);
active: sidebarRoot.visible && !root.pin } else {
onActiveChanged: { // Focus the selected tab GlobalFocusGrab.removeDismissable(panelWindow);
if (active) sidebarLeftBackground.children[0].focusActiveItem()
} }
onCleared: () => { }
if (!active) sidebarRoot.hide() Connections {
target: GlobalFocusGrab
function onDismissed() {
panelWindow.hide();
} }
} }
@@ -136,7 +138,7 @@ Scope { // Scope
anchors.left: parent.left anchors.left: parent.left
anchors.topMargin: Appearance.sizes.hyprlandGapsOut anchors.topMargin: Appearance.sizes.hyprlandGapsOut
anchors.leftMargin: Appearance.sizes.hyprlandGapsOut anchors.leftMargin: Appearance.sizes.hyprlandGapsOut
width: sidebarRoot.sidebarWidth - Appearance.sizes.hyprlandGapsOut - Appearance.sizes.elevationMargin width: panelWindow.sidebarWidth - Appearance.sizes.hyprlandGapsOut - Appearance.sizes.elevationMargin
height: parent.height - Appearance.sizes.hyprlandGapsOut * 2 height: parent.height - Appearance.sizes.hyprlandGapsOut * 2
color: Appearance.colors.colLayer0 color: Appearance.colors.colLayer0
border.width: 1 border.width: 1
@@ -149,11 +151,11 @@ Scope { // Scope
Keys.onPressed: (event) => { Keys.onPressed: (event) => {
if (event.key === Qt.Key_Escape) { if (event.key === Qt.Key_Escape) {
sidebarRoot.hide(); panelWindow.hide();
} }
if (event.modifiers === Qt.ControlModifier) { if (event.modifiers === Qt.ControlModifier) {
if (event.key === Qt.Key_O) { if (event.key === Qt.Key_O) {
sidebarRoot.extend = !sidebarRoot.extend; panelWindow.extend = !panelWindow.extend;
} else if (event.key === Qt.Key_D) { } else if (event.key === Qt.Key_D) {
root.toggleDetach(); root.toggleDetach();
} else if (event.key === Qt.Key_P) { } else if (event.key === Qt.Key_P) {
dots/.config/quickshell/ii/modules/ii/sidebarRight/SidebarRight.qml
+15 -13
View File
@@ -12,11 +12,11 @@ Scope {
property int sidebarWidth: Appearance.sizes.sidebarWidth property int sidebarWidth: Appearance.sizes.sidebarWidth
PanelWindow { PanelWindow {
id: sidebarRoot id: panelWindow
visible: GlobalStates.sidebarRightOpen visible: GlobalStates.sidebarRightOpen
function hide() { function hide() {
GlobalStates.sidebarRightOpen = false GlobalStates.sidebarRightOpen = false;
} }
exclusiveZone: 0 exclusiveZone: 0
@@ -32,12 +32,17 @@ Scope {
bottom: true bottom: true
} }
HyprlandFocusGrab { onVisibleChanged: {
id: grab if (visible) {
windows: [ sidebarRoot ] GlobalFocusGrab.addDismissable(panelWindow);
active: GlobalStates.sidebarRightOpen } else {
onCleared: () => { GlobalFocusGrab.removeDismissable(panelWindow);
if (!active) sidebarRoot.hide() }
}
Connections {
target: GlobalFocusGrab
function onDismissed() {
panelWindow.hide();
} }
} }
@@ -53,16 +58,14 @@ Scope {
height: parent.height - Appearance.sizes.hyprlandGapsOut * 2 height: parent.height - Appearance.sizes.hyprlandGapsOut * 2
focus: GlobalStates.sidebarRightOpen focus: GlobalStates.sidebarRightOpen
Keys.onPressed: (event) => { Keys.onPressed: event => {
if (event.key === Qt.Key_Escape) { if (event.key === Qt.Key_Escape) {
sidebarRoot.hide(); panelWindow.hide();
} }
} }
sourceComponent: SidebarRightContent {} sourceComponent: SidebarRightContent {}
} }
} }
IpcHandler { IpcHandler {
@@ -105,5 +108,4 @@ Scope {
GlobalStates.sidebarRightOpen = false; GlobalStates.sidebarRightOpen = false;
} }
} }
} }
dots/.config/quickshell/ii/modules/ii/verticalBar/VerticalBar.qml
+9
View File
@@ -66,6 +66,7 @@ Scope {
} }
color: "transparent" color: "transparent"
// Positioning
anchors { anchors {
left: !Config.options.bar.bottom left: !Config.options.bar.bottom
right: Config.options.bar.bottom right: Config.options.bar.bottom
@@ -73,6 +74,14 @@ Scope {
bottom: true bottom: true
} }
// Include in focus grab
Component.onCompleted: {
GlobalFocusGrab.addPersistent(barRoot);
}
Component.onDestruction: {
GlobalFocusGrab.removePersistent(barRoot);
}
MouseArea { MouseArea {
id: hoverRegion id: hoverRegion
hoverEnabled: true hoverEnabled: true
dots/.config/quickshell/ii/modules/ii/wallpaperSelector/WallpaperSelector.qml
+10 -6
View File
@@ -39,12 +39,16 @@ Scope {
implicitHeight: Appearance.sizes.wallpaperSelectorHeight implicitHeight: Appearance.sizes.wallpaperSelectorHeight
implicitWidth: Appearance.sizes.wallpaperSelectorWidth implicitWidth: Appearance.sizes.wallpaperSelectorWidth
HyprlandFocusGrab { // Click outside to close Component.onCompleted: {
id: grab GlobalFocusGrab.addDismissable(panelWindow);
windows: [ panelWindow ] }
active: wallpaperSelectorLoader.active Component.onDestruction: {
onCleared: () => { GlobalFocusGrab.removeDismissable(panelWindow);
if (!active) GlobalStates.wallpaperSelectorOpen = false; }
Connections {
target: GlobalFocusGrab
function onDismissed() {
GlobalStates.wallpaperSelectorOpen = false;
} }
} }
dots/.config/quickshell/ii/services/GlobalFocusGrab.qml
+64
View File
@@ -0,0 +1,64 @@
pragma Singleton
pragma ComponentBehavior: Bound
import QtQuick
import Quickshell
import Quickshell.Hyprland
/**
* Manages a HyprlandFocusGrab that's to be shared by all windows.
* "Persistent" is for windows that should always be included but not closed on dismiss, like bar and onscreen keyboard.
* "Dismissable" is for stuff like sidebars
*/
Singleton {
id: root
signal dismissed()
property list<var> persistent: []
property list<var> dismissable: []
function dismiss() {
root.dismissable = [];
root.dismissed();
}
Component.onCompleted: {
console.log("[GlobalFocusGrab] Initialized");
}
function addPersistent(window) {
if (root.persistent.indexOf(window) === -1) {
root.persistent.push(window);
}
}
function removePersistent(window) {
var index = root.persistent.indexOf(window);
if (index !== -1) {
root.persistent.splice(index, 1);
}
}
function addDismissable(window) {
if (root.dismissable.indexOf(window) === -1) {
root.dismissable.push(window);
}
}
function removeDismissable(window) {
var index = root.dismissable.indexOf(window);
if (index !== -1) {
root.dismissable.splice(index, 1);
}
}
HyprlandFocusGrab {
id: grab
windows: [...root.persistent, ...root.dismissable]
active: root.dismissable.length > 0
onCleared: () => {
root.dismiss();
}
}
}