[optimize|chore]截取光标时背景色为透明；重构截图代码

Author: SkyD666

SmartScreenSnapper/SmartScreenSnapper.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2022-10-03T20:44:18. -->
+<!-- Written by QtCreator 4.11.1, 2022-10-06T12:42:40. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -310,7 +310,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5142.win64_mingw73_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">

SmartScreenSnapper/res/RCData.rc

@@ -11,8 +11,8 @@ DAZIJI		SOUND "sound/DAZIJI.wav"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 1,1,1,0
-    PRODUCTVERSION 1,1,1,0
+    FILEVERSION 1,2,0,0
+    PRODUCTVERSION 1,2,0,0
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
     FILEFLAGS VS_FF_DEBUG
@@ -29,8 +29,8 @@ VS_VERSION_INFO VERSIONINFO
             BEGIN
                 VALUE "CompanyName", "Sky_D\0"
                 VALUE "FileDescription", "SmartScreenSnapper\0"
-                VALUE "FileVersion", "1.1.1.0\0"
-                VALUE "ProductVersion", "1.1.1.0\0"
+                VALUE "FileVersion", "1.2.0.0\0"
+                VALUE "ProductVersion", "1.2.0.0\0"
                 VALUE "LegalCopyright", "\0"
                 VALUE "LegalTrademarks", "\0"
                 VALUE "OriginalFilename", "SmartScreenSnapper.exe\0"

SmartScreenSnapper/src/MyGlobalShortcut/MyGlobalShortCut.cpp

@@ -22,10 +22,11 @@ MyGlobalShortCut::MyGlobalShortCut(QString key, QWidget *parent, bool reportErro
                                                 tr("失败，请检查该热键是否被占用！"));
 }
 
-void MyGlobalShortCut::activateShortcut(int i)
+void MyGlobalShortCut::activateShortcut(ScreenShotHelper::ShotType shotType)
 {
-    emit activatedHotKey(i);
+    emit activatedHotKey(shotType);
 }
+
 bool  MyGlobalShortCut::registerHotKey()
 {
     Qt::KeyboardModifiers allMods = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier;

SmartScreenSnapper/src/MyGlobalShortcut/MyGlobalShortCut.h

@@ -6,20 +6,22 @@
 #include "MyWinEventFilter.h"
 #include <QKeySequence>
 #include <QHash>
+#include "src/screenshothelper.h"
+
 class MyGlobalShortCut;
 
 
 class MyGlobalShortCut : public QObject
 {
     Q_OBJECT
 signals:
-    void activatedHotKey(int);
+    void activatedHotKey(ScreenShotHelper::ShotType shotType);
 public:
     MyGlobalShortCut();
     MyGlobalShortCut(QWidget* parent);
     MyGlobalShortCut(QString key,QWidget* parent, bool reportError);
     ~MyGlobalShortCut();
-    void activateShortcut(int i);
+    void activateShortcut(ScreenShotHelper::ShotType shotType);
     bool registerHotKey();
     bool unregisterHotKey();
     QHash<QPair<quint32, quint32>, MyGlobalShortCut*> shortcuts;

SmartScreenSnapper/src/MyGlobalShortcut/MyWinEventFilter.cpp

@@ -28,11 +28,12 @@ bool MyWinEventFilter::nativeEventFilter(const QByteArray &eventType, void *mess
             bool res = m_shortcut->shortcuts.value(qMakePair(keycode, modifiers));
             if (res) {
                 for (int i = 0; i < PublicData::hotKey.size(); i++) {
-                    for (int j = 0; j < PublicData::hotKey.at(i).size(); j++) {
-                        if (MyGlobalShortCut::nativeKeycode(PublicData::hotKey.at(i).at(j)->key) == HIWORD(msg->lParam) &&
-                               MyGlobalShortCut::nativeModifiers(PublicData::hotKey.at(i).at(j)->mods) == LOWORD(msg->lParam)) {
-                            m_shortcut ->activateShortcut(i);
-                            //break;
+                    ScreenShotHelper::ShotType shotType = PublicData::hotKey.keys().at(i);
+                    QList<MyGlobalShortCut*> hotKey = PublicData::hotKey.value(shotType);
+                    for (int j = 0; j < hotKey.size(); j++){
+                        if (MyGlobalShortCut::nativeKeycode(hotKey.at(j)->key) == HIWORD(msg->lParam) &&
+                                MyGlobalShortCut::nativeModifiers(hotKey.at(j)->mods) == LOWORD(msg->lParam)) {
+                            m_shortcut->activateShortcut(shotType);
                         }
                     }
                 }

SmartScreenSnapper/src/freesnapdialog.cpp

@@ -12,15 +12,16 @@
 #include <QClipboard>
 #include <QString>
 
-FreeSnapDialog::FreeSnapDialog(QPixmap picture, QPixmap*& result, QWidget *parent) :
+FreeSnapDialog::FreeSnapDialog(QPixmap picture, QPixmap* result, bool &captured, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::FreeSnapDialog),
     grayColor(0, 0, 0, 180),
     grayItem(nullptr),
     previewZoomRate(3.2f),
     picture(picture),
     pixelColor(nullptr),
-    resultRef(result),
+    resultPixmap(result),
+    captured(captured),
     rectLineWidth(1),
     pointRadius(9),
     deltaHeight(0),
@@ -96,11 +97,14 @@ FreeSnapDialog::FreeSnapDialog(QPixmap picture, QPixmap*& result, QWidget *paren
     setRectVisible(false);
     refreshPointPos();
     refreshGrayArea();
+    update();
 }
 
 FreeSnapDialog::~FreeSnapDialog()
 {
-    resultRef = NULL;
+    scene->removeItem(grayItem);
+    delete grayItem;
+    resultPixmap = nullptr;
     delete ui;
 }
 
@@ -463,12 +467,12 @@ void FreeSnapDialog::refreshPreviewArea(QPoint mousePos)
 void FreeSnapDialog::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) {
-        *this->resultRef = picture.copy(ui->frameRect->geometry());
+        *this->resultPixmap = picture.copy(ui->frameRect->geometry());
+        captured = true;
         close();
         return;
     } else if (event->key() == Qt::Key_Escape) {
-        delete this->resultRef;
-        this->resultRef = NULL;
+        captured = false;
         close();
         return;
     } else if (event->key() == Qt::Key_C) {         // C键复制颜色

SmartScreenSnapper/src/freesnapdialog.h

@@ -27,7 +27,7 @@ class FreeSnapDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit FreeSnapDialog(QPixmap picture, QPixmap*& result, QWidget *parent = nullptr);
+    explicit FreeSnapDialog(QPixmap picture, QPixmap* result, bool &captured, QWidget *parent = nullptr);
     ~FreeSnapDialog();
 
 private:
@@ -47,7 +47,9 @@ class FreeSnapDialog : public QDialog
 
     QColor* pixelColor;
 
-    QPixmap*& resultRef;
+    QPixmap* resultPixmap;
+
+    bool &captured;
 
     int rectLineWidth;
     int pointRadius;

SmartScreenSnapper/src/graphicsview.cpp

@@ -4,7 +4,7 @@
 #include <QDrag>
 #include <QBuffer>
 
-GraphicsView::GraphicsView(QWidget *parent): QGraphicsView(parent), mimeData(NULL)
+GraphicsView::GraphicsView(QWidget *parent): QGraphicsView(parent), mimeData(nullptr)
 {
     this->mousePressed = false;
     lastMousePoint.setX(-1);
@@ -42,13 +42,14 @@ void GraphicsView::mousePressEvent(QMouseEvent *event)
     lastMousePoint.setX(event->x());
     lastMousePoint.setY(event->y());
 
-    if (event->buttons() & Qt::RightButton) {       //准备右键拖出时的图片
-        QImage image(QSize(scene()->width(), scene()->height()), QImage::Format_ARGB32);
-        QPainter painter(&image);
+    if (event->buttons() & Qt::RightButton) {       // 准备右键拖出时的图片
+        QPixmap pixmap(scene()->width(), scene()->height());
+        pixmap.fill(Qt::transparent);
+        QPainter painter(&pixmap);
         scene()->render(&painter);
         mimeData = new QMimeData();
         mimeData->clear();
-        mimeData->setImageData(QImage(image));
+        mimeData->setImageData(pixmap.toImage());
     }
 }