forked from Shinonome/dots-hyprland
no more hacky focus grab thanks to hyprland's dfb841c303263208c2f8ac7a55fbdf4668594fb7
This commit is contained in:
@@ -22,7 +22,6 @@ Scope { // Scope
|
||||
sourceComponent: PanelWindow { // Window
|
||||
id: cheatsheetRoot
|
||||
visible: cheatsheetLoader.active
|
||||
focusable: true
|
||||
|
||||
anchors {
|
||||
top: true
|
||||
@@ -49,28 +48,12 @@ Scope { // Scope
|
||||
HyprlandFocusGrab { // Click outside to close
|
||||
id: grab
|
||||
windows: [ cheatsheetRoot ]
|
||||
active: false
|
||||
active: cheatsheetRoot.visible
|
||||
onCleared: () => {
|
||||
if (!active) cheatsheetRoot.hide()
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: cheatsheetRoot
|
||||
function onVisibleChanged() {
|
||||
delayedGrabTimer.start()
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: delayedGrabTimer
|
||||
interval: ConfigOptions.hacks.arbitraryRaceConditionDelay
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
grab.active = cheatsheetRoot.visible
|
||||
}
|
||||
}
|
||||
|
||||
// Background
|
||||
Rectangle {
|
||||
id: cheatsheetBackground
|
||||
|
||||
@@ -27,7 +27,7 @@ Scope { // Scope
|
||||
PanelWindow { // Window
|
||||
id: sidebarRoot
|
||||
visible: sidebarLoader.active
|
||||
focusable: true
|
||||
|
||||
property int selectedTab: PersistentStates.sidebar.leftSide.selectedTab
|
||||
property bool extend: false
|
||||
property bool pin: false
|
||||
@@ -37,7 +37,10 @@ Scope { // Scope
|
||||
sidebarLoader.active = false
|
||||
}
|
||||
|
||||
exclusiveZone: pin ? sidebarWidth : 0
|
||||
exclusiveZone: {
|
||||
console.log(sidebarRoot.pin ? sidebarWidth : 0)
|
||||
return sidebarRoot.pin ? sidebarWidth : 0
|
||||
}
|
||||
implicitWidth: Appearance.sizes.sidebarWidthExtended
|
||||
WlrLayershell.namespace: "quickshell:sidebarLeft"
|
||||
// Hyprland 0.49: OnDemand is Exclusive, Exclusive just breaks click-outside-to-close
|
||||
@@ -57,32 +60,12 @@ Scope { // Scope
|
||||
HyprlandFocusGrab { // Click outside to close
|
||||
id: grab
|
||||
windows: [ sidebarRoot ]
|
||||
active: false
|
||||
active: sidebarRoot.visible && !sidebarRoot.pin
|
||||
onCleared: () => {
|
||||
if (!active) sidebarRoot.hide()
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: sidebarRoot
|
||||
function onVisibleChanged() {
|
||||
delayedGrabTimer.start()
|
||||
swipeView.children[0].children[0].children[sidebarRoot.selectedTab].forceActiveFocus()
|
||||
}
|
||||
function onPinChanged() {
|
||||
grab.active = !sidebarRoot.pin
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: delayedGrabTimer
|
||||
interval: ConfigOptions.hacks.arbitraryRaceConditionDelay
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
grab.active = sidebarRoot.visible && !sidebarRoot.pin
|
||||
}
|
||||
}
|
||||
|
||||
// Background
|
||||
Rectangle {
|
||||
id: sidebarLeftBackground
|
||||
|
||||
@@ -27,7 +27,6 @@ Scope {
|
||||
PanelWindow {
|
||||
id: sidebarRoot
|
||||
visible: sidebarLoader.active
|
||||
focusable: true
|
||||
|
||||
function hide() {
|
||||
sidebarLoader.active = false
|
||||
@@ -49,28 +48,12 @@ Scope {
|
||||
HyprlandFocusGrab {
|
||||
id: grab
|
||||
windows: [ sidebarRoot ]
|
||||
active: false
|
||||
active: sidebarRoot.visible
|
||||
onCleared: () => {
|
||||
if (!active) sidebarRoot.hide()
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: sidebarRoot
|
||||
function onVisibleChanged() {
|
||||
delayedGrabTimer.start()
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: delayedGrabTimer
|
||||
interval: ConfigOptions.hacks.arbitraryRaceConditionDelay
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
grab.active = sidebarRoot.visible
|
||||
}
|
||||
}
|
||||
|
||||
// Background
|
||||
Rectangle {
|
||||
id: sidebarRightBackground
|
||||
|
||||
Reference in New Issue
Block a user