Invoke screensot tool (Ctrl+Alt+S) on the screen where the mouse curs…

…or is located

CHANGELOG.md

@@ -4,6 +4,9 @@ Trader's Home Task (THT) helps you preparing for a working day on the U.S. stock
 
 See [HOWTO](HOWTO.md) and [README](README.md) for more.
 
+## 2.4.1
+- Invoke screensot tool (Ctrl+Alt+S) on the screen where the mouse cursor is located
+
 ## 2.4.0
 - Updated links in the About dialog
 - Updated the tickers database

THT-version.tag

@@ -1 +1 @@
-2.4.0
+2.4.1

dist/tht.iss

@@ -1,7 +1,7 @@
 #define MyAppName "Trader's Home Task"
 #define MyAppPublisher "Dmitry Baryshev"
 #define MyAppURL "https://github.com/smoked-herring/tht"
-#define MyAppVersion "2.4.0"
+#define MyAppVersion "2.4.1"
 
 [Setup]
 AppId={{16AE5DDE-D073-4F5F-ABC3-11DD9FBF58E3}

regionselect.cpp

@@ -40,17 +40,17 @@ RegionSelect::RegionSelect(KeyboardInteraction _ki, QWidget *parent) :
     setWindowState(Qt::WindowFullScreen);
     setCursor(Qt::CrossCursor);
 
-    QRect rc = QApplication::desktop()->screenGeometry(QCursor::pos());
-
-    sizeDesktop = rc.size();
-    resize(sizeDesktop);
+    screenRect = QApplication::desktop()->screenGeometry(QCursor::pos());
+    setGeometry(screenRect);
 
     desktopPixmapBkg = QPixmap::grabWindow(QApplication::desktop()->winId(),
-                                           rc.x(), rc.y(), rc.width(), rc.height());
+                                           screenRect.x(),
+                                           screenRect.y(),
+                                           screenRect.width(),
+                                           screenRect.height());
 
     desktopPixmapClr = desktopPixmapBkg;
 
-    move(rc.topLeft());
     drawBackGround();
 }
 
@@ -60,16 +60,23 @@ RegionSelect::~RegionSelect()
 bool RegionSelect::event(QEvent *event)
 {
     if(ki == UseKeyboard && event->type() == QEvent::KeyPress)
+    {
+        event->accept();
         reject();
+    }
     else if(event->type() == QEvent::MouseButtonRelease)
     {
+        event->accept();
+
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*> (event);
 
         if(mouseEvent->button() == Qt::LeftButton)
             accept();
     }
     else if(event->type() == QEvent::MouseButtonPress)
     {
+        event->accept();
+
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*> (event);
 
         if(mouseEvent->button() != Qt::LeftButton)
@@ -110,9 +117,9 @@ void RegionSelect::drawBackGround()
     painter.setBrush(QBrush(QColor(0, 0, 0, 85), Qt::SolidPattern));
 
     // draw rect of desktop size in poainter
-    painter.drawRect(QApplication::desktop()->rect());
+    painter.drawRect(rect());
 
-    QRect txtRect = QApplication::desktop()->screenGeometry(QApplication::desktop()->primaryScreen());
+    QRect txtRect = rect();
     QString txtTip = ki == UseKeyboard
             //: Appeal to the user
             ? tr("Using the mouse, select the rectangle, or click\nany keyboard button or right/middle mouse button to cancel.")

regionselect.h

@@ -61,13 +61,14 @@ class RegionSelect : public QDialog
         KeyboardInteraction ki;
 
         QRect selectRect;
-        QSize sizeDesktop;
 
         QPoint selStartPoint;
         QPoint selEndPoint;
 
         QPixmap desktopPixmapBkg;
         QPixmap desktopPixmapClr;
+
+        QRect screenRect;
 };
 
 #endif // REGIONSELECT_H