Răsfoiți Sursa

theme: use smaller padding in treeview and listview

Le Tan 4 ani în urmă
părinte
comite
35920bffe9

+ 4 - 4
src/data/extra/themes/moonlight/interface.qss

@@ -580,8 +580,8 @@ QTreeView {
 }
 
 QTreeView::item {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding-top: 2px;
+    padding-bottom: 2px;
 }
 
 QTreeView::item:hover {
@@ -639,8 +639,8 @@ QListView {
 }
 
 QListView::item {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding-top: 2px;
+    padding-bottom: 2px;
 }
 
 QListView::item:hover {

+ 6 - 0
src/data/extra/themes/moonlight/palette.json

@@ -608,6 +608,12 @@
             "toolbar" : {
                 "bg" : "@base#content#bg"
             }
+        },
+        "quickselector" : {
+            "item_icon" : {
+                "fg" : "@palette#bg2_9",
+                "border" : "@palette#bg2_9"
+            }
         }
     }
 }

+ 4 - 4
src/data/extra/themes/native/interface.qss

@@ -74,14 +74,14 @@ QMainWindow::separator {
 
 /* NotebookExplorer */
 vnotex--NotebookNodeExplorer QTreeView::item {
-    padding-top: 3px;
-    padding-bottom: 3px;
+    padding-top: 2px;
+    padding-bottom: 2px;
 }
 
 /* OutlineViewer */
 vnotex--OutlineViewer QTreeView::item {
-    padding-top: 3px;
-    padding-bottom: 3px;
+    padding-top: 2px;
+    padding-bottom: 2px;
 }
 
 /* QToolButton used for action */

+ 6 - 0
src/data/extra/themes/native/palette.json

@@ -117,6 +117,12 @@
         "navigationlabel" : {
             "fg" : "@widgets#toolbox#title#button#active#fg",
             "bg" : "@widgets#toolbox#title#button#active#bg"
+        },
+        "quickselector" : {
+            "item_icon" : {
+                "fg" : "#535c65",
+                "border" : "#535c65"
+            }
         }
     }
 }

+ 4 - 4
src/data/extra/themes/pure/interface.qss

@@ -580,8 +580,8 @@ QTreeView {
 }
 
 QTreeView::item {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding-top: 2px;
+    padding-bottom: 2px;
 }
 
 QTreeView::item:hover {
@@ -639,8 +639,8 @@ QListView {
 }
 
 QListView::item {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding-top: 2px;
+    padding-bottom: 2px;
 }
 
 QListView::item:hover {

+ 6 - 0
src/data/extra/themes/pure/palette.json

@@ -604,6 +604,12 @@
             "toolbar" : {
                 "bg" : "@base#content#bg"
             }
+        },
+        "quickselector" : {
+            "item_icon" : {
+                "fg" : "@base#master#bg",
+                "border" : "@base#master#bg"
+            }
         }
     }
 }

+ 7 - 1
src/widgets/quickselector.cpp

@@ -11,6 +11,8 @@
 
 #include <utils/widgetutils.h>
 #include <utils/iconutils.h>
+#include <core/thememgr.h>
+#include <core/vnotex.h>
 
 #include "lineedit.h"
 #include "listwidget.h"
@@ -93,11 +95,15 @@ void QuickSelector::updateItemList()
 {
     m_itemList->clear();
 
+    const auto &themeMgr = VNoteX::getInst().getThemeMgr();
+
     for (int i = 0; i < m_items.size(); ++i) {
         const auto &item = m_items[i];
 
         auto listItem = new QListWidgetItem(m_itemList);
-        auto icon = IconUtils::drawTextIcon(item.m_shortcut, "blue", "darkgreen");
+        auto icon = IconUtils::drawTextIcon(item.m_shortcut,
+                                            themeMgr.paletteColor(QStringLiteral("widgets#quickselector#item_icon#fg")),
+                                            themeMgr.paletteColor(QStringLiteral("widgets#quickselector#item_icon#border")));
         listItem->setIcon(icon);
 
         listItem->setText(item.m_name);