[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [spectacle/Applications/16.04] src/QuickEditor: Unbreak rectangular image grabs for nvidia users.
From:       Boudhayan Gupta <me () BaloneyGeek ! com>
Date:       2016-04-25 18:28:50
Message-ID: E1aulFa-0002Al-Rb () scm ! kde ! org
[Download RAW message or body]

Git commit abbbe6d13de870f9e9349acc2542cffc5d41b76d by Boudhayan Gupta.
Committed on 25/04/2016 at 18:28.
Pushed by bgupta into branch 'Applications/16.04'.

Unbreak rectangular image grabs for nvidia users.

BUG: 362241
FIXED-IN: 16.04.1

M  +1    -18   src/QuickEditor/QuickEditor.cpp
M  +0    -1    src/QuickEditor/QuickEditor.h

http://commits.kde.org/kscreengenie/abbbe6d13de870f9e9349acc2542cffc5d41b76d

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:
 


[prev in list] [next in list] [prev in thread] [next in thread]