ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new crop tool from KQuickImageEditor

Browse Source
This commit is contained in:
Noah Davis
2021-09-09 11:54:36 -04:00
parent 44bc2388c6
commit 2a9d739bc9
1 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
imports/NeoChat/Page/ImageEditorPage.qml
View File

@@ -21,14 +21,14 @@ Kirigami.Page {
title: i18n("Edit") title: i18n("Edit")
leftPadding: 0 leftPadding: 0
rightPadding: 0 rightPadding: 0
topPadding: 0
bottomPadding: 0
function crop() { function crop() {
const ratioX = editImage.paintedWidth / editImage.nativeWidth; const ratioX = editImage.paintedWidth / editImage.nativeWidth;
const ratioY = editImage.paintedHeight / editImage.nativeHeight; const ratioY = editImage.paintedHeight / editImage.nativeHeight;
rootEditorView.resizing = false rootEditorView.resizing = false
imageDoc.crop(resizeRectangle.insideX / ratioX, resizeRectangle.insideY / ratioY, resizeRectangle.insideWidth / ratioX, resizeRectangle.insideHeight / ratioY); imageDoc.crop(selectionTool.selectionX / ratioX, selectionTool.selectionY / ratioY, selectionTool.selectionWidth / ratioX, selectionTool.selectionHeight / ratioY);
} }
actions { actions {
@@ -58,8 +58,11 @@ Kirigami.Page {
contentItem: KQuickImageEditor.ImageItem { KQuickImageEditor.ImageItem {
id: editImage id: editImage
// Assigning this to the contentItem and setting the padding causes weird positioning issues
anchors.fill: parent
anchors.margins: Kirigami.Units.gridUnit
fillMode: KQuickImageEditor.ImageItem.PreserveAspectFit fillMode: KQuickImageEditor.ImageItem.PreserveAspectFit
image: imageDoc.image image: imageDoc.image
@@ -76,12 +79,41 @@ Kirigami.Page {
Shortcut { Shortcut {
sequence: StandardKey.SaveAs sequence: StandardKey.SaveAs
onActivated: saveAsAction.trigger(); onActivated: saveAsAction.trigger();
} anchors.fill: parent }
KQuickImageEditor.ImageDocument { KQuickImageEditor.ImageDocument {
id: imageDoc id: imageDoc
path: rootEditorView.imagePath path: rootEditorView.imagePath
} }
KQuickImageEditor.SelectionTool {
id: selectionTool
visible: rootEditorView.resizing
width: editImage.paintedWidth
height: editImage.paintedHeight
x: editImage.horizontalPadding
y: editImage.verticalPadding
KQuickImageEditor.CropBackground {
anchors.fill: parent
z: -1
insideX: selectionTool.selectionX
insideY: selectionTool.selectionY
insideWidth: selectionTool.selectionWidth
insideHeight: selectionTool.selectionHeight
}
Connections {
target: selectionTool.selectionArea
function onDoubleClicked() {
rootEditorView.crop()
}
}
}
onImageChanged: {
selectionTool.selectionX = 0
selectionTool.selectionY = 0
selectionTool.selectionWidth = Qt.binding(() => selectionTool.width)
selectionTool.selectionHeight = Qt.binding(() => selectionTool.height)
}
} }
header: QQC2.ToolBar { header: QQC2.ToolBar {
@@ -145,22 +177,4 @@ Kirigami.Page {
showCloseButton: true showCloseButton: true
visible: false visible: false
} }
KQuickImageEditor.ResizeRectangle {
id: resizeRectangle
visible: rootEditorView.resizing
width: editImage.paintedWidth
height: editImage.paintedHeight
x: editImage.horizontalPadding
y: editImage.verticalPadding
insideX: 100
insideY: 100
insideWidth: 100
insideHeight: 100
onAcceptSize: rootEditorView.crop();
}
} }