nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

picker: better manual selection

Browse source 
No rounding and thinner border when selecting manually
This commit is contained in:
2 * r + 2 * t 2025-06-19 22:15:44 +10:00
parent e4d2226dd0
commit 75b618f1e8
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
modules/areapicker/Picker.qml
View file

@ -16,7 +16,12 @@ MouseArea {
required property ShellScreen screen required property ShellScreen screen
property int borderWidth property int borderWidth
property real rounding property int rounding
property bool onClient
property real realBorderWidth: onClient ? borderWidth : 2
property real realRounding: onClient ? rounding : 0
property real ssx property real ssx
property real ssy property real ssy
@ -36,6 +41,7 @@ MouseArea {
function checkClientRects(x: real, y: real): void { function checkClientRects(x: real, y: real): void {
for (const c of clients) { for (const c of clients) {
if (c.x <= x && c.y <= y && c.x + c.width >= x && c.y + c.height >= y) { if (c.x <= x && c.y <= y && c.x + c.width >= x && c.y + c.height >= y) {
onClient = true;
sx = c.x; sx = c.x;
sy = c.y; sy = c.y;
ex = c.x + c.width; ex = c.x + c.width;
@ -80,6 +86,7 @@ MouseArea {
const y = event.y; const y = event.y;
if (pressed) { if (pressed) {
onClient = false;
sx = ssx; sx = ssx;
sy = ssy; sy = ssy;
ex = x; ex = x;
@ -183,7 +190,7 @@ MouseArea {
Rectangle { Rectangle {
id: selectionRect id: selectionRect
radius: root.rounding radius: root.realRounding
x: root.rsx x: root.rsx
y: root.rsy y: root.rsy
implicitWidth: root.sw implicitWidth: root.sw
@ -204,14 +211,14 @@ MouseArea {
Rectangle { Rectangle {
color: "transparent" color: "transparent"
radius: root.rounding > 0 ? root.rounding + root.borderWidth : 0 radius: root.realRounding > 0 ? root.realRounding + root.realBorderWidth : 0
border.width: root.borderWidth border.width: root.realBorderWidth
border.color: Colours.palette.m3primary border.color: Colours.palette.m3primary
x: selectionRect.x - root.borderWidth x: selectionRect.x - root.realBorderWidth
y: selectionRect.y - root.borderWidth y: selectionRect.y - root.realBorderWidth
implicitWidth: selectionRect.implicitWidth + root.borderWidth * 2 implicitWidth: selectionRect.implicitWidth + root.realBorderWidth * 2
implicitHeight: selectionRect.implicitHeight + root.borderWidth * 2 implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2
Behavior on border.color { Behavior on border.color {
ColorAnimation { ColorAnimation {