修正不适用ribbon的显示

czyt1988 · Jan 4, 2024 · 0c9a672 · 0c9a672
1 parent db54f80
commit 0c9a672
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/SARibbonBar/SARibbonMainWindow.cpp b/src/SARibbonBar/SARibbonMainWindow.cpp
@@ -28,6 +28,7 @@ class SARibbonMainWindow::PrivateData
     SA_RIBBON_DECLARE_PUBLIC(SARibbonMainWindow)
 public:
     PrivateData(SARibbonMainWindow* p);
+    void installFrameless(SARibbonMainWindow* p);
 
 public:
     SARibbonMainWindow::RibbonTheme mCurrentRibbonTheme { SARibbonMainWindow::RibbonThemeOffice2013 };
@@ -42,10 +43,15 @@ class SARibbonMainWindow::PrivateData
 
 SARibbonMainWindow::PrivateData::PrivateData(SARibbonMainWindow* p) : q_ptr(p)
 {
+}
+
+void SARibbonMainWindow::PrivateData::installFrameless(SARibbonMainWindow* p)
+{
 #if SARIBBON_USE_3RDPARTY_FRAMELESSHELPER
     mFramelessHelper = new QWK::WidgetWindowAgent(p);
     mFramelessHelper->setup(p);
 #else
+    d_ptr->mFramelessHelper = new SAFramelessHelper(p);
 #endif
 }
 
@@ -57,6 +63,7 @@ SARibbonMainWindow::SARibbonMainWindow(QWidget* parent, bool useRibbon, const Qt
 {
     connect(qApp, &QApplication::primaryScreenChanged, this, &SARibbonMainWindow::onPrimaryScreenChanged);
     if (useRibbon) {
+        d_ptr->installFrameless(this);
         setRibbonBar(createRibbonBar());
         setRibbonTheme(ribbonTheme());
     } else {
@@ -98,6 +105,7 @@ void SARibbonMainWindow::setRibbonBar(SARibbonBar* bar)
         d_ptr->mWindowButtonGroup = new SAWindowButtonGroup(this);
     }
     d_ptr->mWindowButtonGroup->setWindowStates(windowState());
+    d_ptr->mWindowButtonGroup->raise();
     d_ptr->mWindowButtonGroup->show();
     helper->setHitTestVisible(bar->ribbonTabBar());         // IMPORTANT!
     helper->setHitTestVisible(bar->rightButtonGroup());     // IMPORTANT!
@@ -110,9 +118,6 @@ void SARibbonMainWindow::setRibbonBar(SARibbonBar* bar)
     QMainWindow::setMenuWidget(bar);
     bar->installEventFilter(this);
     // 设置窗体的标题栏高度
-    if (nullptr == d_ptr->mFramelessHelper) {
-        d_ptr->mFramelessHelper = new SAFramelessHelper(this);
-    }
     d_ptr->mFramelessHelper->setTitleHeight(bar->titleBarHeight());
     // 设置window按钮
     if (nullptr == d_ptr->mWindowButtonGroup) {
@@ -122,6 +127,7 @@ void SARibbonMainWindow::setRibbonBar(SARibbonBar* bar)
     s.setHeight(bar->titleBarHeight());
     d_ptr->mWindowButtonGroup->setFixedSize(s);
     d_ptr->mWindowButtonGroup->setWindowStates(windowState());
+    d_ptr->mWindowButtonGroup->raise();
     d_ptr->mWindowButtonGroup->show();
 
 #endif

diff --git a/src/example/MainWindowExample/MainWindowExample.pro b/src/example/MainWindowExample/MainWindowExample.pro
@@ -26,7 +26,7 @@ RESOURCES += \
 include($$PWD/../../../common.pri)
 include($${SARIBBONBAR_PRI_FILE_PATH})
 
-DESTDIR = $${SARIBBON_BIN_DIR}
+DESTDIR = $${SARIBBON_BIN_DIR}/bin
 
 msvc {
     QMAKE_CFLAGS += /utf-8

diff --git a/src/example/NormalMenuBarExample/NormalMenuBarExample.pro b/src/example/NormalMenuBarExample/NormalMenuBarExample.pro
@@ -21,7 +21,7 @@ HEADERS  += \ \
 
 
 include($$PWD/../../../common.pri)
-DESTDIR = $${SARIBBON_BIN_DIR}
+DESTDIR = $${SARIBBON_BIN_DIR}/bin
 include($${SARIBBONBAR_PRI_FILE_PATH})
 
 msvc {

diff --git a/src/example/WidgetWithRibbon/WidgetWithRibbon.pro b/src/example/WidgetWithRibbon/WidgetWithRibbon.pro
@@ -35,7 +35,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 include($$PWD/../../../common.pri)
 include($${SARIBBONBAR_PRI_FILE_PATH})
 
-DESTDIR = $${SARIBBON_BIN_DIR}
+DESTDIR = $${SARIBBON_BIN_DIR}/bin
 
 msvc {
     QMAKE_CFLAGS += /utf-8