From cc605e24d93a3a23996f975658b5859e229dd40b Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Mon, 20 Oct 2025 21:09:27 +0200 Subject: [PATCH] region selector: fix target regions --- .../ii/modules/regionSelector/RegionSelection.qml | 9 +++++++-- .../ii/modules/regionSelector/TargetRegion.qml | 8 +++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dots/.config/quickshell/ii/modules/regionSelector/RegionSelection.qml b/dots/.config/quickshell/ii/modules/regionSelector/RegionSelection.qml index 32549fbc0..7f83c4e33 100644 --- a/dots/.config/quickshell/ii/modules/regionSelector/RegionSelection.qml +++ b/dots/.config/quickshell/ii/modules/regionSelector/RegionSelection.qml @@ -48,7 +48,6 @@ PanelWindow { property color imageBorderColor: "#ddf1d1ff" property color imageFillColor: "#33f1d1ff" property color onBorderColor: "#ff000000" - property real standardRounding: 4 readonly property var windows: [...HyprlandData.windowList].sort((a, b) => { // Sort floating=true windows before others if (a.floating === b.floating) return 0; @@ -357,13 +356,13 @@ PanelWindow { root.snip(); } onPositionChanged: (mouse) => { + root.updateTargetedRegion(mouse.x, mouse.y); if (!root.dragging) return; root.draggingX = mouse.x; root.draggingY = mouse.y; root.dragDiffX = mouse.x - root.dragStartX; root.dragDiffY = mouse.y - root.dragStartY; root.points.push({ x: mouse.x, y: mouse.y }); - root.updateTargetedRegion(mouse.x, mouse.y); } Loader { @@ -478,6 +477,8 @@ PanelWindow { && root.targetedRegionWidth === modelData.size[0] && root.targetedRegionHeight === modelData.size[1]) + colBackground: root.genericContentColor + colForeground: root.genericContentForeground opacity: root.draggedAway ? 0 : 1 visible: opacity > 0 Behavior on opacity { @@ -510,6 +511,8 @@ PanelWindow { && root.targetedRegionWidth === modelData.size[0] && root.targetedRegionHeight === modelData.size[1]) + colBackground: root.genericContentColor + colForeground: root.genericContentForeground opacity: root.draggedAway ? 0 : 1 visible: opacity > 0 Behavior on opacity { @@ -542,6 +545,8 @@ PanelWindow { && root.targetedRegionWidth === modelData.size[0] && root.targetedRegionHeight === modelData.size[1]) + colBackground: root.genericContentColor + colForeground: root.genericContentForeground opacity: root.draggedAway ? 0 : 1 visible: opacity > 0 Behavior on opacity { diff --git a/dots/.config/quickshell/ii/modules/regionSelector/TargetRegion.qml b/dots/.config/quickshell/ii/modules/regionSelector/TargetRegion.qml index 0fc2774fb..49a755ab0 100644 --- a/dots/.config/quickshell/ii/modules/regionSelector/TargetRegion.qml +++ b/dots/.config/quickshell/ii/modules/regionSelector/TargetRegion.qml @@ -16,6 +16,8 @@ import Quickshell.Hyprland Rectangle { id: regionRect + required property color colBackground + required property color colForeground property bool showIcon: false property bool targeted: false property color borderColor @@ -26,14 +28,14 @@ Rectangle { color: fillColor border.color: borderColor border.width: targeted ? 3 : 1 - radius: root.standardRounding + radius: 4 Rectangle { id: regionLabelBackground property real verticalPadding: 5 property real horizontalPadding: 10 radius: 10 - color: root.genericContentColor + color: regionRect.colBackground border.width: 1 border.color: Appearance.m3colors.m3outlineVariant anchors { @@ -62,7 +64,7 @@ Rectangle { StyledText { id: regionText text: regionRect.text - color: root.genericContentForeground + color: regionRect.colForeground } } }