diff --git a/src/widget/tool/screenshotgrabber.cpp b/src/widget/tool/screenshotgrabber.cpp index e521e31e5..ae6b5015d 100644 --- a/src/widget/tool/screenshotgrabber.cpp +++ b/src/widget/tool/screenshotgrabber.cpp @@ -76,7 +76,14 @@ void ScreenshotGrabber::showGrabber() this->window->show(); this->window->setFocus(); this->window->grabKeyboard(); - adjustWindowSize(); + + QRect fullGrabbedRect = screenGrab.rect(); + qDebug() << "adjusting grabber size to" << fullGrabbedRect; + + this->window->setGeometry(fullGrabbedRect); + this->window->scene()->setSceneRect(fullGrabbedRect); + this->overlay->setRect(fullGrabbedRect); + adjustTooltipPosition(); } @@ -191,21 +198,6 @@ 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(); diff --git a/src/widget/tool/screenshotgrabber.h b/src/widget/tool/screenshotgrabber.h index ef7f62ea2..72eede1fc 100644 --- a/src/widget/tool/screenshotgrabber.h +++ b/src/widget/tool/screenshotgrabber.h @@ -71,8 +71,6 @@ private: bool handleKeyPress(QKeyEvent* event); void reject(); - QRect getSystemScreenRect(); - void adjustWindowSize(); QPixmap grabScreen(); void beginRectChooser(QGraphicsSceneMouseEvent* event);