move picker to main panelwindow to reduce vram usage
This commit is contained in:
+69
-24
@@ -41,6 +41,7 @@ Item {
|
||||
property real rsy: Math.min(sy, ey)
|
||||
readonly property real scaleRatio: Hypr.monitorFor(screen).scale
|
||||
required property ShellScreen screen
|
||||
required property ScreenState screenState
|
||||
property real sh: Math.abs(sy - ey)
|
||||
readonly property color shadowColor: Hypr.options.decoration.shadow?.color ?? "black"
|
||||
readonly property bool shadowEnabled: Hypr.options.decoration.shadow.enabled
|
||||
@@ -97,10 +98,6 @@ Item {
|
||||
const args = Config.screenshot.mode === "auto" ? ["--rounding", `${rounding}`, "--radius", root.cornerRadius, "--shadow", root.shadowEnabled, "--shadow-blur", `${shadow_blur}`, "--shadow-color", `${r},${g},${b},${a}`, "--shadow-offset-x", root.shadowOffset[0], "--shadow-offset-y", root.shadowOffset[1]] : [];
|
||||
const postCmd = Config.screenshot.enable_pp ? ["zshell-img-tools", "--scale", root.scaleRatio, ...args, "--image"] : null;
|
||||
|
||||
overlay.visible = border.visible = false;
|
||||
handles.visible = false;
|
||||
toolbar.visible = false;
|
||||
|
||||
ZShellIo.saveItem(captureLayer, tmpfile, Qt.rect(Math.ceil(rsx), Math.ceil(rsy), Math.floor(sw), Math.floor(sh)), path => {
|
||||
const finalize = finalPath => {
|
||||
if (copyToClipboard) {
|
||||
@@ -158,7 +155,7 @@ Item {
|
||||
|
||||
Component.onCompleted: {
|
||||
Hypr.extras.refreshOptions();
|
||||
screencopy.active = true;
|
||||
root.forceActiveFocus();
|
||||
|
||||
opacity = 1;
|
||||
|
||||
@@ -223,13 +220,63 @@ Item {
|
||||
onReleased: root.enterEditMode()
|
||||
}
|
||||
|
||||
Connections {
|
||||
function onClosingChanged(): void {
|
||||
if (root.loader.closing)
|
||||
closeAnim.start();
|
||||
else {
|
||||
closeAnim.stop();
|
||||
returnAnim.start();
|
||||
}
|
||||
}
|
||||
|
||||
target: root.loader
|
||||
}
|
||||
|
||||
ParallelAnimation {
|
||||
id: returnAnim
|
||||
|
||||
Anim {
|
||||
duration: 300
|
||||
property: "opacity"
|
||||
target: root
|
||||
to: 1
|
||||
}
|
||||
|
||||
Anim {
|
||||
property: "rsx"
|
||||
target: root
|
||||
to: Math.min(root.sx, root.ex)
|
||||
}
|
||||
|
||||
Anim {
|
||||
property: "rsy"
|
||||
target: root
|
||||
to: Math.min(root.sy, root.ey)
|
||||
}
|
||||
|
||||
Anim {
|
||||
property: "sw"
|
||||
target: root
|
||||
to: Math.abs(root.sx - root.ex)
|
||||
}
|
||||
|
||||
Anim {
|
||||
property: "sh"
|
||||
target: root
|
||||
to: Math.abs(root.sy - root.ey)
|
||||
}
|
||||
}
|
||||
|
||||
SequentialAnimation {
|
||||
id: closeAnim
|
||||
|
||||
PropertyAction {
|
||||
property: "closing"
|
||||
target: root.loader
|
||||
value: true
|
||||
ScriptAction {
|
||||
script: {
|
||||
const states = ShellState.allStates();
|
||||
for (const s of states)
|
||||
s.screenshot = false;
|
||||
}
|
||||
}
|
||||
|
||||
ParallelAnimation {
|
||||
@@ -271,17 +318,12 @@ Item {
|
||||
|
||||
anchors.fill: parent
|
||||
|
||||
Loader {
|
||||
ScreencopyView {
|
||||
id: screencopy
|
||||
|
||||
active: false
|
||||
anchors.fill: parent
|
||||
asynchronous: true
|
||||
|
||||
sourceComponent: ScreencopyView {
|
||||
captureSource: root.screen
|
||||
paintCursor: false
|
||||
}
|
||||
captureSource: root.screen
|
||||
paintCursor: false
|
||||
}
|
||||
|
||||
AnnotationCanvas {
|
||||
@@ -309,8 +351,7 @@ Item {
|
||||
color: "white"
|
||||
layer.enabled: true
|
||||
opacity: 0.3
|
||||
radius: root.realRounding
|
||||
visible: screencopy.item?.hasContent ?? false
|
||||
visible: screencopy.hasContent
|
||||
|
||||
layer.effect: MultiEffect {
|
||||
maskEnabled: true
|
||||
@@ -347,7 +388,7 @@ Item {
|
||||
implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2
|
||||
implicitWidth: selectionRect.implicitWidth + root.realBorderWidth * 2
|
||||
radius: root.realRounding > 0 ? root.realRounding + root.realBorderWidth : 0
|
||||
visible: screencopy.item?.hasContent ?? false
|
||||
visible: screencopy.hasContent
|
||||
x: selectionRect.x - root.realBorderWidth
|
||||
y: selectionRect.y - root.realBorderWidth
|
||||
|
||||
@@ -370,10 +411,14 @@ Item {
|
||||
visible: root.mode === "edit" && root.tool === "move"
|
||||
|
||||
onBoundsChanged: (x, y, w, h) => {
|
||||
root.sx = x;
|
||||
root.sy = y;
|
||||
root.ex = x + w;
|
||||
root.ey = y + h;
|
||||
let nx = Math.max(0, x);
|
||||
let ny = Math.max(0, y);
|
||||
let nw = Math.min(w, root.screen.width - nx);
|
||||
let nh = Math.min(h, root.screen.height - ny);
|
||||
root.sx = nx;
|
||||
root.sy = ny;
|
||||
root.ex = nx + nw;
|
||||
root.ey = ny + nh;
|
||||
}
|
||||
onMoveBy: (dx, dy) => {
|
||||
const w = root.sw, h = root.sh;
|
||||
|
||||
Reference in New Issue
Block a user