Merge settings window to main #23
+17
-4
@@ -141,7 +141,7 @@ MouseArea {
|
|||||||
sy = ssy;
|
sy = ssy;
|
||||||
ex = x;
|
ex = x;
|
||||||
ey = y;
|
ey = y;
|
||||||
} else {
|
} else if (!saveTimer.running) {
|
||||||
checkClientRects(x, y);
|
checkClientRects(x, y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -154,7 +154,7 @@ MouseArea {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (root.loader.freeze) {
|
if (root.loader.freeze) {
|
||||||
save();
|
saveTimer.start();
|
||||||
} else {
|
} else {
|
||||||
overlay.visible = border.visible = false;
|
overlay.visible = border.visible = false;
|
||||||
screencopy.visible = false;
|
screencopy.visible = false;
|
||||||
@@ -162,6 +162,16 @@ MouseArea {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Timer {
|
||||||
|
id: saveTimer
|
||||||
|
|
||||||
|
interval: 25
|
||||||
|
repeat: false
|
||||||
|
running: false
|
||||||
|
|
||||||
|
onTriggered: root.save()
|
||||||
|
}
|
||||||
|
|
||||||
SequentialAnimation {
|
SequentialAnimation {
|
||||||
id: closeAnim
|
id: closeAnim
|
||||||
|
|
||||||
@@ -217,9 +227,10 @@ MouseArea {
|
|||||||
paintCursor: false
|
paintCursor: false
|
||||||
|
|
||||||
onHasContentChanged: {
|
onHasContentChanged: {
|
||||||
if (hasContent && !root.loader.freeze) {
|
if (hasContent) {
|
||||||
overlay.visible = border.visible = true;
|
overlay.visible = border.visible = true;
|
||||||
root.save();
|
if (!root.loader.freeze)
|
||||||
|
root.save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -233,6 +244,7 @@ MouseArea {
|
|||||||
layer.enabled: true
|
layer.enabled: true
|
||||||
opacity: 0.3
|
opacity: 0.3
|
||||||
radius: root.realRounding
|
radius: root.realRounding
|
||||||
|
visible: false
|
||||||
|
|
||||||
layer.effect: MultiEffect {
|
layer.effect: MultiEffect {
|
||||||
maskEnabled: true
|
maskEnabled: true
|
||||||
@@ -270,6 +282,7 @@ MouseArea {
|
|||||||
implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2
|
implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2
|
||||||
implicitWidth: selectionRect.implicitWidth + root.realBorderWidth * 2
|
implicitWidth: selectionRect.implicitWidth + root.realBorderWidth * 2
|
||||||
radius: root.realRounding > 0 ? root.realRounding + root.realBorderWidth : 0
|
radius: root.realRounding > 0 ? root.realRounding + root.realBorderWidth : 0
|
||||||
|
visible: false
|
||||||
x: selectionRect.x - root.realBorderWidth
|
x: selectionRect.x - root.realBorderWidth
|
||||||
y: selectionRect.y - root.realBorderWidth
|
y: selectionRect.y - root.realBorderWidth
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user