Merge branch 'tmp' into dev

czyt1988 · Feb 22, 2024 · dd6baf4 · dd6baf4
2 parents 064c15c + 2b0260d
commit dd6baf4
Show file tree

Hide file tree

Showing 4 changed files with 159 additions and 47 deletions.
diff --git a/src/SARibbonBar/colorWidgets/SAColorGridWidget.cpp b/src/SARibbonBar/colorWidgets/SAColorGridWidget.cpp
@@ -9,7 +9,7 @@ class SAColorGridWidget::PrivateData
     SA_COLOR_WIDGETS_DECLARE_PUBLIC(SAColorGridWidget)
 public:
     PrivateData(SAColorGridWidget* p);
-    //获取ColorToolButton
+    // 获取ColorToolButton
     SAColorToolButton* getColorToolButtonAt(int index);
     SAColorToolButton* getColorToolButtonAt(int r, int c);
     SAColorToolButton* getCheckedButton() const;
@@ -27,7 +27,7 @@ class SAColorGridWidget::PrivateData
     QButtonGroup* mButtonGroup { nullptr };
     QSize mIconSize { 16, 16 };
     int mColumnCount { 8 };  ///< 列数，行数量会根据列数量来匹配,如果设置-1或者0，说明不限定列数量，这样会只有一行
-    bool mColorCheckable;    ///<设置颜色是否是checkable
+    bool mColorCheckable;    ///< 设置颜色是否是checkable
     bool mHorizontalSpacerToRight { false };  ///< 最右边是否有弹簧
 };
 
@@ -89,19 +89,19 @@ void SAColorGridWidget::PrivateData::updateGridColor(bool isRemoveSpacer)
             }
         }
     }
-    //清除多余单元格
+    // 清除多余单元格
     int nowGridRow = mGridLayout->rowCount();
     int nowGridCol = mGridLayout->columnCount();
     if (nowGridRow > row) {
-        //多余的清除
+        // 多余的清除
         for (int r = row; r < nowGridRow; ++r) {
             for (int c = 0; c < nowGridCol; ++c) {
                 removeAt(r, c);
             }
         }
     }
     if (nowGridCol > col) {
-        //多余的列清除
+        // 多余的列清除
         for (int r = 0; r < row; ++r) {
             for (int c = col; c < nowGridCol; ++c) {
                 if (isRemoveSpacer) {
@@ -179,7 +179,7 @@ void SAColorGridWidget::PrivateData::setColorAt(const QColor& clr, int r, int c)
             tl->setColor(clr);
         }
     } else {
-        SAColorToolButton* tl = new SAColorToolButton(q_ptr);
+        SAColorToolButton* tl = new SAColorToolButton(SAColorToolButton::NoColorMenu, q_ptr);
         tl->setToolButtonStyle(Qt::ToolButtonIconOnly);
         tl->setIconSize(mIconSize);
         tl->setMargins(QMargins(4, 4, 4, 4));
@@ -208,10 +208,22 @@ bool SAColorGridWidget::PrivateData::isSpacer(int r, int c) const
 
 SAColorGridWidget::SAColorGridWidget(QWidget* par) : QWidget(par), d_ptr(new SAColorGridWidget::PrivateData(this))
 {
-    connect(d_ptr->mButtonGroup, QOverload< QAbstractButton* >::of(&QButtonGroup::buttonClicked), this, &SAColorGridWidget::onButtonClicked);
-    connect(d_ptr->mButtonGroup, QOverload< QAbstractButton* >::of(&QButtonGroup::buttonPressed), this, &SAColorGridWidget::onButtonPressed);
-    connect(d_ptr->mButtonGroup, QOverload< QAbstractButton* >::of(&QButtonGroup::buttonReleased), this, &SAColorGridWidget::onButtonReleased);
-    connect(d_ptr->mButtonGroup, QOverload< QAbstractButton*, bool >::of(&QButtonGroup::buttonToggled), this, &SAColorGridWidget::onButtonToggled);
+    connect(d_ptr->mButtonGroup,
+            QOverload< QAbstractButton* >::of(&QButtonGroup::buttonClicked),
+            this,
+            &SAColorGridWidget::onButtonClicked);
+    connect(d_ptr->mButtonGroup,
+            QOverload< QAbstractButton* >::of(&QButtonGroup::buttonPressed),
+            this,
+            &SAColorGridWidget::onButtonPressed);
+    connect(d_ptr->mButtonGroup,
+            QOverload< QAbstractButton* >::of(&QButtonGroup::buttonReleased),
+            this,
+            &SAColorGridWidget::onButtonReleased);
+    connect(d_ptr->mButtonGroup,
+            QOverload< QAbstractButton*, bool >::of(&QButtonGroup::buttonToggled),
+            this,
+            &SAColorGridWidget::onButtonToggled);
 }
 
 SAColorGridWidget::~SAColorGridWidget()

diff --git a/src/SARibbonBar/colorWidgets/SAColorPaletteGridWidget.cpp b/src/SARibbonBar/colorWidgets/SAColorPaletteGridWidget.cpp
@@ -6,7 +6,6 @@
 #include <QColorDialog>
 // SA
 #include "SAColorGridWidget.h"
-#include "SAColorToolButton.h"
 class SAColorPaletteGridWidget::PrivateData
 {
     SA_COLOR_WIDGETS_DECLARE_PUBLIC(SAColorPaletteGridWidget)