fix: 折叠优化

mhduiy · Jul 12, 2023 · f8b1083 · f8b1083
1 parent 2cf00a5
commit f8b1083
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/src/customComponents/MSidebar.cpp b/src/customComponents/MSidebar.cpp
@@ -54,12 +54,15 @@ void MSidebar::addWidgetItem(const QString &text, const QIcon& icon) {
 
 void MSidebar::foldPage() {
     cutX = this->pos().x();
-    if(cutX != 0) { //当前是折叠状态
-        tarX = 0;
+    if(cutX == -1 * this->width() + foldBtn->width()) { //当前是折叠状态
+        tarX = 0;  //设置为展开
     }
-    else {
+    else if(cutX == 0){ // 当前是展开状态
         tarX = -1 * this->width() + foldBtn->width();
     }
+    else {
+        return;
+    }
     animationTimer.start(1);
 }
 
@@ -89,6 +92,7 @@ void MSidebar::showEvent(QShowEvent *event) {
         setCurrentIndex(0); //设置默认选择项
         connect(listWidget, &QListWidget::currentRowChanged, this, &MSidebar::currentIndexChanged);
         foldPage();
+        isFirstShow = false;
     }
 }
 

diff --git a/src/mainWidget/mainwindow.cpp b/src/mainWidget/mainwindow.cpp
@@ -32,6 +32,8 @@ MainWindow::MainWindow(QWidget *parent)
         this->stackedWidget->setCurrentIndex(index);
     });
 
+    qDebug() << "show";
+
     statusBar()->hide();
     setCentralWidget(main);
     this->centralWidget()->layout()->setMargin(10);

diff --git a/src/simplyScreenShot/simpyScreenShot.cpp b/src/simplyScreenShot/simpyScreenShot.cpp
@@ -7,6 +7,9 @@
 #include <QGroupBox>
 #include <QFile>
 #include <QDebug>
+#include <QGuiApplication>
+#include <QScreen>
+#include <QThread>
 
 SimpyScreenShot::SimpyScreenShot(QWidget *parent) : QWidget(parent){
     initUI();
@@ -65,7 +68,18 @@ void SimpyScreenShot::initUI() {
 }
 
 void SimpyScreenShot::screenShotOperator() {
-
+    QObject *obj = this->parent()->parent()->parent();
+    if(QString(obj->metaObject()->className()) == "MainWindow") {
+        qobject_cast<QWidget*>(obj)->hide();
+    }
+    QScreen *screen = QGuiApplication::primaryScreen();
+    pixmap = screen->grabWindow(0);
+    imageDisPlay->setScaledContents(true);   // 设置图片自动缩放
+    imageDisPlay->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);  // 设置大小策略
+    imageDisPlay->setPixmap(pixmap);
+    if(QString(obj->metaObject()->className()) == "MainWindow") {
+        qobject_cast<QWidget*>(obj)->show();
+    }
 }
 
 void SimpyScreenShot::colorPickerOperator() {

diff --git a/src/simplyScreenShot/simpyScreenShot.h b/src/simplyScreenShot/simpyScreenShot.h
@@ -8,6 +8,7 @@
 #include "customComponents/MButton.h"
 #include <QLabel>
 #include <QLineEdit>
+#include <QPixmap>
 
 class SimpyScreenShot : public QWidget{
     Q_OBJECT
@@ -28,9 +29,11 @@ class SimpyScreenShot : public QWidget{
     MButton *saveImageBtn = nullptr;        // 保存图片
     MButton *startScreenShotBtn = nullptr;  // 屏幕截图
     MButton *startColorPicker = nullptr;    // 取色器
-    QLabel *colorDis{};                       // 显示取到的颜色
-    QLineEdit *colorValue{};                  // 显示颜色值
-    MButton *copyColorValueBtn{};             // 复制颜色值
+    QLabel *colorDis = nullptr;             // 显示取到的颜色
+    QLineEdit *colorValue = nullptr;        // 显示颜色值
+    MButton *copyColorValueBtn = nullptr;   // 复制颜色值
+
+    QPixmap pixmap;
 };