parent
0c9434090e
commit
3acddf1b43
@ -1 +1 @@
|
||||
/spectacle-16.04.0.tar.xz
|
||||
/spectacle-16.04.1.tar.xz
|
||||
|
@ -1,41 +0,0 @@
|
||||
From 3d4dcacc6cbbd75f9d31d26bfa2a1f2ced37f721 Mon Sep 17 00:00:00 2001
|
||||
From: Boudhayan Gupta <me@BaloneyGeek.com>
|
||||
Date: Mon, 25 Apr 2016 23:15:43 +0530
|
||||
Subject: [PATCH 3/4] Unbreak HiDPI
|
||||
|
||||
---
|
||||
src/QuickEditor/EditorRoot.qml | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/QuickEditor/EditorRoot.qml b/src/QuickEditor/EditorRoot.qml
|
||||
index 55c6177..f7fb33b 100644
|
||||
--- a/src/QuickEditor/EditorRoot.qml
|
||||
+++ b/src/QuickEditor/EditorRoot.qml
|
||||
@@ -36,10 +36,10 @@ Item {
|
||||
}
|
||||
|
||||
selection = cropRectangle.createObject(parent, {
|
||||
- "x": xx,
|
||||
- "y": yy,
|
||||
+ "x": xx,
|
||||
+ "y": yy,
|
||||
"height": hh,
|
||||
- "width": ww
|
||||
+ "width": ww
|
||||
});
|
||||
|
||||
cropDisplayCanvas.requestPaint();
|
||||
@@ -73,8 +73,8 @@ Item {
|
||||
source: "image://snapshot/rawimage";
|
||||
cache: false;
|
||||
|
||||
- height: Window.height;
|
||||
- width: Window.width;
|
||||
+ height: Window.height / Screen.devicePixelRatio;
|
||||
+ width: Window.width / Screen.devicePixelRatio;
|
||||
fillMode: Image.PreserveAspectFit;
|
||||
}
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
@ -1,56 +0,0 @@
|
||||
From abbbe6d13de870f9e9349acc2542cffc5d41b76d Mon Sep 17 00:00:00 2001
|
||||
From: Boudhayan Gupta <me@BaloneyGeek.com>
|
||||
Date: Mon, 25 Apr 2016 23:57:49 +0530
|
||||
Subject: [PATCH 4/4] Unbreak rectangular image grabs for nvidia users.
|
||||
|
||||
BUG: 362241
|
||||
FIXED-IN: 16.04.1
|
||||
---
|
||||
src/QuickEditor/QuickEditor.cpp | 19 +------------------
|
||||
src/QuickEditor/QuickEditor.h | 1 -
|
||||
2 files changed, 1 insertion(+), 19 deletions(-)
|
||||
|
||||
diff --git a/src/QuickEditor/QuickEditor.cpp b/src/QuickEditor/QuickEditor.cpp
|
||||
index 81a8fd0..a9bb72f 100644
|
||||
--- a/src/QuickEditor/QuickEditor.cpp
|
||||
+++ b/src/QuickEditor/QuickEditor.cpp
|
||||
@@ -138,23 +138,6 @@ void QuickEditor::acceptImageHandler(int x, int y, int width, int height)
|
||||
d->mGrabRect = QRect(x, y, width, height);
|
||||
SpectacleConfig::instance()->setCropRegion(d->mGrabRect);
|
||||
|
||||
- QQuickItem *target = d->mQuickView->rootObject()->findChild<QQuickItem *>(QStringLiteral("imageBackground"));
|
||||
- d->mCurrentGrabResult = target->grabToImage();
|
||||
- if (d->mCurrentGrabResult.isNull()) {
|
||||
- emit grabCancelled();
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- connect(d->mCurrentGrabResult.data(), &QQuickItemGrabResult::ready, this, &QuickEditor::grabReadyHandler);
|
||||
-}
|
||||
-
|
||||
-void QuickEditor::grabReadyHandler()
|
||||
-{
|
||||
- Q_D(QuickEditor);
|
||||
-
|
||||
- QImage croppedImage = d->mCurrentGrabResult->image().copy(d->mGrabRect);
|
||||
- QPixmap croppedPixmap = QPixmap::fromImage(croppedImage);
|
||||
-
|
||||
d->mQuickView->hide();
|
||||
- emit grabDone(croppedPixmap, d->mGrabRect);
|
||||
+ emit grabDone(mImageStore->mPixmap.copy(d->mGrabRect), d->mGrabRect);
|
||||
}
|
||||
diff --git a/src/QuickEditor/QuickEditor.h b/src/QuickEditor/QuickEditor.h
|
||||
index cadd5bb..5cca825 100644
|
||||
--- a/src/QuickEditor/QuickEditor.h
|
||||
+++ b/src/QuickEditor/QuickEditor.h
|
||||
@@ -39,7 +39,6 @@ class QuickEditor : public QObject
|
||||
private slots:
|
||||
|
||||
void acceptImageHandler(int x, int y, int width, int height);
|
||||
- void grabReadyHandler();
|
||||
|
||||
private:
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
@ -1 +1 @@
|
||||
231a565255ff420b2a8b0974530b1c28 spectacle-16.04.0.tar.xz
|
||||
385471b28d5be50ff64ebe4315193833 spectacle-16.04.1.tar.xz
|
||||
|
Loading…
Reference in new issue