修复重复刷新的问题

czyt1988 · Nov 20, 2023 · ff68619 · ff68619
1 parent 2e51696
commit ff68619
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/SARibbonBar/SARibbonBar.cpp b/src/SARibbonBar/SARibbonBar.cpp
@@ -97,6 +97,7 @@ class SARibbonBar::PrivateData
         , mTitleAligment(Qt::AlignCenter)
         , mIsTitleVisible(true)
         , mEnableUserDefineAccessBarIconSize(false)
+        , mEnableUserDefineRightBarIconSize(false)
         , mRibbonAlignment(SARibbonAlignment::AlignLeft)
     {
         mContextCategoryColorList = SARibbonBar::getDefaultContextCategoryColorList();
@@ -1861,7 +1862,7 @@ void SARibbonBar::changeEvent(QEvent* e)
 
 void SARibbonBar::resizeInOfficeStyle()
 {
-    synchronousCategoryLayoutMode();
+    synchronousCategoryLayoutMode(false);
     QMargins border = contentsMargins();
     int x           = border.left();
     int y           = border.top();
@@ -1969,7 +1970,7 @@ void SARibbonBar::resizeInOfficeStyle()
 
 void SARibbonBar::resizeInWpsLiteStyle()
 {
-    synchronousCategoryLayoutMode();
+    synchronousCategoryLayoutMode(false);
     QMargins border = contentsMargins();
     int x           = border.left();
     int y           = border.top();

diff --git a/src/example/MainWindowExample/mainwindow.cpp b/src/example/MainWindowExample/mainwindow.cpp
@@ -493,6 +493,15 @@ void MainWindow::createOtherActions()
     mOtherActionIcon1 = new QAction(QIcon(":/icon/icon/layout.svg"), ("action with icon"), this);
 }
 
+#include <QMessageBox>
+void MainWindow::closeEvent(QCloseEvent* e)
+{
+    auto res = QMessageBox::question(this, tr("question"), tr("Confirm whether to exit"));
+    if (res == QMessageBox::Yes) {
+        SARibbonMainWindow::closeEvent(e);
+    }
+}
+
 void MainWindow::createCategoryMain(SARibbonCategory* page)
 {
     //! 1

diff --git a/src/example/MainWindowExample/mainwindow.h b/src/example/MainWindowExample/mainwindow.h
@@ -10,6 +10,7 @@ class SARibbonButtonGroupWidget;
 class SARibbonPannel;
 class QTextEdit;
 class QComboBox;
+class QCloseEvent;
 
 class MainWindow : public SARibbonMainWindow
 {
@@ -70,6 +71,9 @@ private slots:
     // 创建其它actions，这些actions并不在SARibbonBar管理
     void createOtherActions();
 
+protected:
+    void closeEvent(QCloseEvent* e) override;
+
 private:
     SARibbonContextCategory* mContextCategory;
     SARibbonContextCategory* mContextCategory2;