From 6c7226778805694256ee7b34427525be62e32e38 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Wed, 7 Dec 2016 22:01:58 +0800
Subject: [PATCH] add padding to QTreeWidgetItem and QListWidgetItem

Signed-off-by: Le Tan <tamlokveer@gmail.com>
---
 src/resources/icons/current_tab.svg |  8 ++++++++
 src/resources/vnote.qss             | 16 +++++++++++++---
 src/veditwindow.cpp                 | 10 +++++++---
 src/vnote.qrc                       |  1 +
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 src/resources/icons/current_tab.svg

diff --git a/src/resources/icons/current_tab.svg b/src/resources/icons/current_tab.svg
new file mode 100644
index 00000000..b51f8169
--- /dev/null
+++ b/src/resources/icons/current_tab.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<path d="M184.7,413.1l2.1-1.8l156.5-136c5.3-4.6,8.6-11.5,8.6-19.2c0-7.7-3.4-14.6-8.6-19.2L187.1,101l-2.6-2.3
+	C182,97,179,96,175.8,96c-8.7,0-15.8,7.4-15.8,16.6h0v286.8h0c0,9.2,7.1,16.6,15.8,16.6C179.1,416,182.2,414.9,184.7,413.1z"/>
+</svg>
diff --git a/src/resources/vnote.qss b/src/resources/vnote.qss
index 9680ce11..cca43e10 100644
--- a/src/resources/vnote.qss
+++ b/src/resources/vnote.qss
@@ -1,14 +1,14 @@
-QPushButton[OnMainWindow="true"] {
+QPushButton[FlatBtn="true"] {
     padding: 3px;
     border: none;
     background-color: transparent;
 }
 
-QPushButton[OnMainWindow="true"]::menu-indicator {
+QPushButton[FlatBtn="true"]::menu-indicator {
     image: none;
 }
 
-QPushButton[OnMainWindow="true"]::hover {
+QPushButton[FlatBtn="true"]::hover {
     background-color: @hover-color;
 }
 
@@ -73,3 +73,13 @@ QComboBox#NotebookSelector QListWidget::item:hover {
     background-color: @hover-color;
 }
 /* End QComboBox#NotebookSelector */
+
+QTreeWidget::item {
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
+
+QListWidget::item {
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
diff --git a/src/veditwindow.cpp b/src/veditwindow.cpp
index bcffa22f..88f286d2 100644
--- a/src/veditwindow.cpp
+++ b/src/veditwindow.cpp
@@ -44,7 +44,7 @@ void VEditWindow::setupCornerWidget()
 
     rightBtn = new QPushButton(QIcon(":/resources/icons/corner_menu.svg"),
                                "", this);
-    rightBtn->setProperty("OnMainWindow", true);
+    rightBtn->setProperty("FlatBtn", true);
     QMenu *rightMenu = new QMenu(this);
     rightMenu->addAction(splitAct);
     rightMenu->addAction(removeSplitAct);
@@ -59,7 +59,7 @@ void VEditWindow::setupCornerWidget()
             this, &VEditWindow::tabListJump);
     leftBtn = new QPushButton(QIcon(":/resources/icons/corner_tablist.svg"),
                               "", this);
-    leftBtn->setProperty("OnMainWindow", true);
+    leftBtn->setProperty("FlatBtn", true);
     QMenu *leftMenu = new QMenu(this);
     leftBtn->setMenu(leftMenu);
     setCornerWidget(leftBtn, Qt::TopLeftCorner);
@@ -384,14 +384,18 @@ void VEditWindow::updateTabListMenu()
         delete tmpAct;
     }
 
+    int curTab = currentIndex();
     QTabBar *tabbar = tabBar();
     int nrTab = tabbar->count();
     for (int i = 0; i < nrTab; ++i) {
         VEditTab *editor = getTab(i);
         QPointer<VFile> file = editor->getFile();
-        QAction *action = new QAction(file->getName(), tabListAct);
+        QAction *action = new QAction(tabbar->tabText(i), tabListAct);
         action->setStatusTip(generateTooltip(file));
         action->setData(QVariant::fromValue(file));
+        if (i == curTab) {
+            action->setIcon(QIcon(":/resources/icons/current_tab.svg"));
+        }
         menu->addAction(action);
     }
 }
diff --git a/src/vnote.qrc b/src/vnote.qrc
index 8c146490..278338f6 100644
--- a/src/vnote.qrc
+++ b/src/vnote.qrc
@@ -70,5 +70,6 @@
         <file>resources/icons/dir_item.svg</file>
         <file>resources/icons/notebook_item.svg</file>
         <file>resources/icons/arrow_dropdown.svg</file>
+        <file>resources/icons/current_tab.svg</file>
     </qresource>
 </RCC>