调整高分屏的显示效果，去除没用的类

czyt1988 · Dec 15, 2023 · e3bbaf3 · e3bbaf3
1 parent 8f37687
commit e3bbaf3
Show file tree

Hide file tree

Showing 11 changed files with 504 additions and 323 deletions.
diff --git a/src/SARibbonBar/SARibbonBar.pri b/src/SARibbonBar/SARibbonBar.pri
@@ -50,7 +50,6 @@ SOURCES += \
     $$PWD/SARibbonCustomizeWidget.cpp \
     $$PWD/SARibbonElementFactory.cpp \
     $$PWD/SARibbonMainWindow.cpp \
-    $$PWD/SARibbonStyleOption.cpp \
     $$PWD/SAWindowButtonGroup.cpp \
     $$PWD/SARibbonApplicationButton.cpp \
     $$PWD/SARibbonTabBar.cpp \
@@ -88,7 +87,6 @@ HEADERS  += \
     $$PWD/SARibbonCustomizeWidget.h \
     $$PWD/SARibbonElementFactory.h \
     $$PWD/SARibbonMainWindow.h \
-    $$PWD/SARibbonStyleOption.h \
     $$PWD/SAWindowButtonGroup.h \
     $$PWD/SARibbonApplicationButton.h \
     $$PWD/SARibbonTabBar.h \

diff --git a/src/SARibbonBar/SARibbonElementFactory.cpp b/src/SARibbonBar/SARibbonElementFactory.cpp
@@ -16,7 +16,7 @@
 #include "SARibbonPannelOptionButton.h"
 #include "SARibbonPannelLayout.h"
 
-SARibbonElementFactory::SARibbonElementFactory() : mStyleOption(new SARibbonStyleOption())
+SARibbonElementFactory::SARibbonElementFactory()
 {
 }
 
@@ -94,20 +94,6 @@ SARibbonQuickAccessBar* SARibbonElementFactory::createQuickAccessBar(QWidget* pa
     return (new SARibbonQuickAccessBar(parent));
 }
 
-SARibbonStyleOption& SARibbonElementFactory::getRibbonStyleOption()
-{
-    return (*mStyleOption);
-}
-
-/**
- * @brief 设置style配置
- * @param opt
- */
-void SARibbonElementFactory::setRibbonStyleOption(SARibbonStyleOption* opt)
-{
-    mStyleOption.reset(opt);
-}
-
 /**
  * @brief 创建SARibbonPannelOptionButton
  * @param pannel 附属的pannel

diff --git a/src/SARibbonBar/SARibbonElementFactory.h b/src/SARibbonBar/SARibbonElementFactory.h
@@ -7,7 +7,6 @@
 #include <QScopedPointer>
 #include "SARibbonBar.h"
 #include "SARibbonPannel.h"
-#include "SARibbonStyleOption.h"
 class QWidget;
 class SARibbonBar;
 class SARibbonTabBar;
@@ -50,16 +49,8 @@ class SA_RIBBON_EXPORT SARibbonElementFactory
     virtual SARibbonStackedWidget* createRibbonStackedWidget(SARibbonBar* parent);
     virtual SARibbonButtonGroupWidget* craeteButtonGroupWidget(QWidget* parent);
     virtual SARibbonQuickAccessBar* createQuickAccessBar(QWidget* parent);
-
-    // SARibbonStyleOption可以进行继承，此函数无需设置为虚函数
-    SARibbonStyleOption& getRibbonStyleOption();
-    void setRibbonStyleOption(SARibbonStyleOption* opt);
-
-    //创建SARibbonPannelOptionButton
+    // 创建SARibbonPannelOptionButton
     virtual SARibbonPannelOptionButton* createRibbonPannelOptionButton(SARibbonPannel* pannel);
-
-private:
-    QScopedPointer< SARibbonStyleOption > mStyleOption;
 };
 
 #endif  // SARIBBONELEMENTCREATEDELEGATE_H
diff --git a/src/SARibbonBar/SARibbonGalleryGroup.cpp b/src/SARibbonBar/SARibbonGalleryGroup.cpp
@@ -4,7 +4,6 @@
 #include <QActionGroup>
 #include <QItemSelectionModel>
 #include "SARibbonElementManager.h"
-#include "SARibbonStyleOption.h"
 /**
  * @brief The SARibbonGalleryGroupPrivate class
  */
@@ -262,7 +261,7 @@ void SARibbonGalleryGroup::recalcGridSize(int galleryHeight)
         }
     }
     setGridSize(QSize(w, h));
-    //在通过GalleryGroupStyle确定icon的尺寸
+    // 在通过GalleryGroupStyle确定icon的尺寸
     const int shiftpix = 4;  // 这个是移动像素，qt在鼠标移动到图标上时会移动一下，给用户明确的动态，导致如果布局很满会超出显示范围，因此要在此基础上缩放一点
     switch (getGalleryGroupStyle()) {
     case IconWithText: {

diff --git a/src/SARibbonBar/SARibbonPannel.cpp b/src/SARibbonBar/SARibbonPannel.cpp
@@ -664,8 +664,6 @@ int SARibbonPannel::pannelTitleHeight()
 
 /**
  * @brief 设置pannel的全局高度，此函数是个全局的影响
- * @note SARibbonStyleOption会用到此函数，调用设置函数后需要手动重新计算SARibbonStyleOption的内容,@sa SARibbonStyleOption::recalc
- * @sa SARibbonStyleOption
  * @param h
  */
 void SARibbonPannel::setPannelTitleHeight(int h)
@@ -728,7 +726,7 @@ void SARibbonPannel::resizeEvent(QResizeEvent* event)
         if (ThreeRowMode == pannelLayoutMode()) {
             d_ptr->m_optionActionButton->move(width() - d_ptr->m_optionActionButton->width() - 2,
                                               height() - titleHeight()
-                                                  + (titleHeight() - d_ptr->m_optionActionButton->height()) / 2);
+                                                      + (titleHeight() - d_ptr->m_optionActionButton->height()) / 2);
         } else {
             d_ptr->m_optionActionButton->move(width() - d_ptr->m_optionActionButton->width(),
                                               height() - d_ptr->m_optionActionButton->height());

diff --git a/src/SARibbonBar/SARibbonPannelLayout.cpp b/src/SARibbonBar/SARibbonPannelLayout.cpp
diff --git a/src/SARibbonBar/SARibbonStyleOption.cpp b/src/SARibbonBar/SARibbonStyleOption.cpp
diff --git a/src/SARibbonBar/SARibbonStyleOption.h b/src/SARibbonBar/SARibbonStyleOption.h
diff --git a/src/SARibbonBar/SAWindowButtonGroup.cpp b/src/SARibbonBar/SAWindowButtonGroup.cpp
@@ -154,7 +154,7 @@ class SAWindowButtonGroup::PrivateData
     QSize sizeHint() const
     {
         int width  = 0;
-        int height = RibbonSubElementStyleOpt.titleBarHeight();
+        int height = 30;
 
         if (buttonClose) {
             width += 40;