mosaic bug fix on win 11

xland · Jan 2, 2025 · 66477a0 · 66477a0
1 parent 53cfc13
commit 66477a0
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 306 deletions.
diff --git a/App/Tray.cpp b/App/Tray.cpp
@@ -46,6 +46,11 @@ Tray::Tray(const QJsonObject& obj, const QString& lang, QObject *parent) : QObje
                 about->raise();
                 });
         }
+        else if (name == "start") {
+            connect(action, &QAction::triggered, []() {
+                App::start();
+                });
+        }
         connect(action, &QAction::hovered, []() {
             QGuiApplication::setOverrideCursor(Qt::ArrowCursor);
         });

diff --git a/App/Util.cpp b/App/Util.cpp
@@ -1,8 +1,8 @@
 #include <QMessageBox>
 #include "Util.h"
 #include "../Win/WinBox.h"
-#include "../Lib/DWMCapture/DWMCapture.h"
-#pragma comment(lib, "comctl32.lib")
+
+
 
 QMouseEvent Util::createMouseEvent(const QEvent::Type& type, const Qt::MouseButton& btn)
 {

diff --git a/Config/config.json b/Config/config.json
@@ -20,6 +20,11 @@
   "tray": {
     "iconPath": "Config/logo.ico",
     "menu": [
+      {
+        "name": "start",
+        "zhcn": "截图",
+        "en": "Capture"
+      },
       {
         "name": "about",
         "zhcn": "关于",

diff --git a/Lib/DWMCapture/DWMCapture.cpp b/Lib/DWMCapture/DWMCapture.cpp
diff --git a/Lib/DWMCapture/DWMCapture.h b/Lib/DWMCapture/DWMCapture.h
diff --git a/Lib/DWMCapture/d3d_device.cpp b/Lib/DWMCapture/d3d_device.cpp
diff --git a/Lib/DWMCapture/d3d_device.h b/Lib/DWMCapture/d3d_device.h
diff --git a/Lib/DWMCapture/types.h b/Lib/DWMCapture/types.h
diff --git a/ScreenCapture.vcxproj b/ScreenCapture.vcxproj
@@ -118,8 +118,6 @@
     <ClCompile Include="App\About.cpp" />
     <ClCompile Include="App\App.cpp" />
     <ClCompile Include="App\NativeRect.cpp" />
-    <ClCompile Include="Lib\DWMCapture\d3d_device.cpp" />
-    <ClCompile Include="Lib\DWMCapture\DWMCapture.cpp" />
     <ClCompile Include="Shape\ShapeArrow.cpp" />
     <ClCompile Include="Shape\ShapeBase.cpp" />
     <ClCompile Include="Shape\ShapeEllipse.cpp" />
@@ -170,9 +168,6 @@
     <QtMoc Include="Shape\ShapeArrow.h" />
     <ClInclude Include="App\NativeRect.h" />
     <ClInclude Include="App\Res.h" />
-    <ClInclude Include="Lib\DWMCapture\d3d_device.h" />
-    <ClInclude Include="Lib\DWMCapture\DWMCapture.h" />
-    <ClInclude Include="Lib\DWMCapture\types.h" />
     <ClInclude Include="Lib\spdlog\async.h" />
     <ClInclude Include="Lib\spdlog\async_logger-inl.h" />
     <ClInclude Include="Lib\spdlog\async_logger.h" />

diff --git a/Win/WinPin.cpp b/Win/WinPin.cpp
@@ -175,9 +175,9 @@ void WinPin::mousePress(QMouseEvent* event)
 }
 
 void WinPin::mousePressRight(QMouseEvent* event)
-{
+{
+    auto flag = state == State::start;
     HMENU hMenu = CreatePopupMenu();
-    auto flag = state == State::start;
     AppendMenu(hMenu, flag ? MF_UNCHECKED : MF_CHECKED, 1001, menuItems["toolBar"].data());
     AppendMenu(hMenu, MF_STRING, 1002, menuItems["quit"].data());
     auto pos = event->pos();

diff --git a/todo.md b/todo.md
@@ -7,6 +7,7 @@
 - release 托盘图标
 - release 退出应用
 - 鼠标滚轮放大钉图窗口
+- Tray Menu用原生的
 
 
 - 通过命令行截图