SARibbonCategory可通过qss设置背景颜色

czyt1988 · Dec 17, 2023 · c754b20 · c754b20
1 parent 97d128b
commit c754b20
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 17 deletions.
diff --git a/src/SARibbonBar/SARibbonCategory.cpp b/src/SARibbonBar/SARibbonCategory.cpp
@@ -228,12 +228,14 @@ void SARibbonCategory::PrivateData::doWheelEvent(QWheelEvent* event)
 
 SARibbonCategory::SARibbonCategory(QWidget* p) : QWidget(p), d_ptr(new SARibbonCategory::PrivateData(this))
 {
+    setAttribute(Qt::WA_StyledBackground);
     setLayout(new SARibbonCategoryLayout(this));
 }
 
 SARibbonCategory::SARibbonCategory(const QString& name, QWidget* p)
     : QWidget(p), d_ptr(new SARibbonCategory::PrivateData(this))
 {
+    setAttribute(Qt::WA_StyledBackground);
     setLayout(new SARibbonCategoryLayout(this));
     setCategoryName(name);
 }

diff --git a/src/SARibbonBar/resource/theme-dark.qss b/src/SARibbonBar/resource/theme-dark.qss
@@ -28,17 +28,17 @@ SARibbonCtrlContainer {
 }
 
 /*SARibbonCategory*/
+SARibbonCategory {
+  background-color: #b2b2b2;
+}
 SARibbonCategory:focus {
   outline: none;
 }
 
-SARibbonCategory {
-  background-color: #b2b2b2;
-}
+
 
 /*SARibbonStackedWidget*/
 SARibbonStackedWidget{
-  background-color: #b2b2b2;
   border-top-width: 0px;
 }
 SARibbonStackedWidget:focus{

diff --git a/src/SARibbonBar/resource/theme-office2013.qss b/src/SARibbonBar/resource/theme-office2013.qss
@@ -27,17 +27,16 @@ SARibbonCtrlContainer {
 }
 
 /*SARibbonCategory*/
+SARibbonCategory {
+  background-color: #fcfdfe;
+}
 SARibbonCategory:focus {
   outline: none;
 }
 
-SARibbonCategory {
-  background-color: #fcfdfe;
-}
 
 /*SARibbonStackedWidget*/
 SARibbonStackedWidget {
-  background-color: white;
   border: 1pt solid #c5d2e0;
   border-top-width: 0px;
 }

diff --git a/src/SARibbonBar/resource/theme-office2016-blue.qss b/src/SARibbonBar/resource/theme-office2016-blue.qss
@@ -95,13 +95,13 @@ SARibbonCtrlContainer {
 }
 
 /*SARibbonCategory*/
-SARibbonCategory:focus {
-  outline: none;
-}
 
 SARibbonCategory {
   background-color: #f1f1f1;/* {Category.BKColor} */
 }
+SARibbonCategory:focus {
+  outline: none;
+}
 
 
 /*SARibbonCategoryScrollButton*/
@@ -131,7 +131,6 @@ SARibbonPannel > SARibbonButtonGroupWidget {
 
 /*SARibbonStackedWidget*/
 SARibbonStackedWidget {
-  background-color: #f1f1f1;/* {Category.BKColor} */
   border: 1pt solid #f1f1f1;/* {Category.BorderColor} */
   border-top-width: 0px;
 }

diff --git a/src/SARibbonBar/resource/theme-office2021-blue.qss b/src/SARibbonBar/resource/theme-office2021-blue.qss
@@ -130,7 +130,6 @@ SARibbonPannel > SARibbonButtonGroupWidget {
 
 /*SARibbonStackedWidget*/
 SARibbonStackedWidget {
-  background-color: #ffffff;/* {Category.BKColor} */
   border: 1pt solid #ffffff;/* {Category.BorderColor} */
   border-top-width: 0px;
 }

diff --git a/src/SARibbonBar/resource/theme-win7.qss b/src/SARibbonBar/resource/theme-win7.qss
@@ -36,7 +36,6 @@ SARibbonCategory{
 
 /*SARibbonStackedWidget*/
 SARibbonStackedWidget{
-  background-color: white;
   border-top-width: 0px;
 }
 SARibbonStackedWidget:focus{

diff --git a/src/example/MainWindowExample/mainwindow.cpp b/src/example/MainWindowExample/mainwindow.cpp
@@ -41,6 +41,7 @@
 #include <QTextStream>
 #include <QXmlStreamWriter>
 #include <QMessageBox>
+#include <QShortcut>
 #define PRINT_COST_START()                                                                                             \
     QElapsedTimer __TMP_COST;                                                                                          \
     __TMP_COST.start();                                                                                                \
@@ -509,12 +510,17 @@ void MainWindow::createCategoryMain(SARibbonCategory* page)
     SARibbonPannel* pannelStyle = page->addPannel(("ribbon style"));
 
     QAction* actSave = createAction(tr("Save"), ":/icon/icon/save.svg");
-    actSave->setShortcut(QKeySequence(QLatin1String("Ctrl+S")));
-    pannelStyle->addLargeAction(actSave);
+    //这样设置快捷键
+    QShortcut* shortCut = new QShortcut(QKeySequence(QLatin1String("Ctrl+S")), this);
+    connect(shortCut, &QShortcut::activated, this, [ actSave ]() { actSave->trigger(); });
+    //这样设置是无效的
+    // actSave->setShortcut(QKeySequence(QLatin1String("Ctrl+S")));
+
     connect(actSave, &QAction::triggered, this, [ this ](bool b) {
         Q_UNUSED(b);
         this->mTextedit->append("actSaveion clicked");
     });
+    pannelStyle->addLargeAction(actSave);
 
     QAction* actHideRibbon = createAction(tr("hide ribbon"), ":/icon/icon/hideRibbon.svg", "actHideRibbon");
     actHideRibbon->setCheckable(true);
@@ -1065,6 +1071,7 @@ void MainWindow::createContextCategoryPage1(SARibbonCategory* page)
 
     mActionUnlock = createAction(tr("unlock"), ":/icon/icon/unlock.svg");
     mActionUnlock->setShortcut(QKeySequence(QLatin1String("Ctrl+E")));
+    mActionUnlock->setShortcutContext(Qt::ApplicationShortcut);
     pannel->addLargeAction(mActionUnlock);
     connect(mActionUnlock, &QAction::triggered, this, [ this ](bool b) {
         Q_UNUSED(b);
@@ -1079,6 +1086,7 @@ void MainWindow::createContextCategoryPage1(SARibbonCategory* page)
 
     mActionSetTextTest->setCheckable(true);
     mActionSetTextTest->setShortcut(QKeySequence(QLatin1String("Ctrl+D")));
+    mActionSetTextTest->setShortcutContext(Qt::ApplicationShortcut);
     pannel->addLargeAction(mActionSetTextTest);
 
     connect(mActionSetTextTest, &QAction::toggled, this, [ this ](bool b) {
@@ -1095,7 +1103,7 @@ void MainWindow::createContextCategoryPage1(SARibbonCategory* page)
     pannel->addLargeAction(mActionShowTest);
 
     mPannelVisbileExample = page->addPannel(tr("show/hide"));
-
+    //重复添加
     mPannelVisbileExample->addLargeAction(mActionSetTextTest);
 
     connect(mActionShowTest, &QAction::toggled, this, [ this ](bool b) {