Merge remote-tracking branch 'antis81/ngf/fix/screen-grabber'

src/widget/tool/screenshotgrabber.cpp

@@ -34,8 +34,8 @@
 #include "toolboxgraphicsitem.h"
 #include "src/widget/widget.h"
 
-ScreenshotGrabber::ScreenshotGrabber(QWidget* parent)
-    : QWidget(parent)
+ScreenshotGrabber::ScreenshotGrabber(QObject* parent)
+    : QObject(parent)
 {
     scene = new QGraphicsScene;
     window = new QGraphicsView (scene); // Top-level widget
@@ -66,7 +66,7 @@ bool ScreenshotGrabber::eventFilter(QObject* object, QEvent* event)
     if (event->type() == QEvent::KeyPress)
         return handleKeyPress(static_cast<QKeyEvent*>(event));
 
-    return QWidget::eventFilter(object, event);
+    return QObject::eventFilter(object, event);
 }
 
 void ScreenshotGrabber::showGrabber()
@@ -76,7 +76,14 @@ void ScreenshotGrabber::showGrabber()
     this->window->show();
     this->window->setFocus();
     this->window->grabKeyboard();
-    adjustWindowSize();
+
+    QRect fullGrabbedRect = screenGrab.rect();
+    QRect rec = QApplication::primaryScreen()->virtualGeometry();
+
+    this->window->setGeometry(rec);
+    this->scene->setSceneRect(fullGrabbedRect);
+    this->overlay->setRect(fullGrabbedRect);
+
     adjustTooltipPosition();
 }
 
@@ -191,28 +198,15 @@ void ScreenshotGrabber::reject()
     Widget::getInstance()->setVisible(true); // show window if it was hidden
 }
 
-QRect ScreenshotGrabber::getSystemScreenRect()
-{
-    return QApplication::primaryScreen()->virtualGeometry();
-}
-
-void ScreenshotGrabber::adjustWindowSize()
-{
-    QRect systemScreenRect = getSystemScreenRect();
-    qDebug() << "adjusting grabber size to" << systemScreenRect;
-
-    this->window->setGeometry(systemScreenRect);
-    this->window->scene()->setSceneRect(systemScreenRect);
-    this->overlay->setRect(systemScreenRect);
-}
-
 QPixmap ScreenshotGrabber::grabScreen()
 {
-    QScreen* screen = QApplication::primaryScreen();
-    if (screen)
-        return screen->grabWindow(0);
-
-    return QPixmap();
+    QScreen* screen = QGuiApplication::primaryScreen();
+    QRect rec = screen->virtualGeometry();
+    return screen->grabWindow(QApplication::desktop()->winId(),
+                              rec.x(),
+                              rec.y(),
+                              rec.width(),
+                              rec.height());
 }
 
 void ScreenshotGrabber::beginRectChooser(QGraphicsSceneMouseEvent* event)

src/widget/tool/screenshotgrabber.h

@@ -35,12 +35,12 @@ class QGraphicsTextItem;
 class QGraphicsScene;
 class QGraphicsView;
 
-class ScreenshotGrabber : public QWidget
+class ScreenshotGrabber : public QObject
 {
     Q_OBJECT
 public:
 
-    ScreenshotGrabber(QWidget* parent);
+    ScreenshotGrabber(QObject* parent);
     ~ScreenshotGrabber() override;
 
     bool eventFilter(QObject* object, QEvent* event) override;
@@ -71,8 +71,6 @@ private:
     bool handleKeyPress(QKeyEvent* event);
     void reject();
 
-    QRect getSystemScreenRect();
-    void adjustWindowSize();
     QPixmap grabScreen();
 
     void beginRectChooser(QGraphicsSceneMouseEvent* event);