From 24f6204fe3521e1b537aecc84fc64f128ad1d2bc Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Fri, 15 Dec 2017 20:06:27 +0800
Subject: [PATCH] themes: fix treeview style

---
 src/resources/themes/v_pure/v_pure.palette   |  1 +
 src/resources/themes/v_pure/v_pure.qss       | 30 ++++++++++++++++++++
 src/resources/themes/v_white/v_white.palette |  1 +
 src/resources/themes/v_white/v_white.qss     | 30 ++++++++++++++++++++
 src/vvimindicator.cpp                        |  4 +++
 5 files changed, 66 insertions(+)

diff --git a/src/resources/themes/v_pure/v_pure.palette b/src/resources/themes/v_pure/v_pure.palette
index af29bb0c..43de1963 100644
--- a/src/resources/themes/v_pure/v_pure.palette
+++ b/src/resources/themes/v_pure/v_pure.palette
@@ -265,6 +265,7 @@ insertselector_bg=@base_bg
 ; TreeView.
 treeview_fg=@content_fg
 treeview_bg=@content_bg
+treeview_item_border_bg=@border_bg
 treeview_item_hover_fg=@hover_fg
 treeview_item_hover_bg=@hover_bg
 treeview_item_selected_fg=@selected_fg
diff --git a/src/resources/themes/v_pure/v_pure.qss b/src/resources/themes/v_pure/v_pure.qss
index 66f4d366..1be0d71e 100644
--- a/src/resources/themes/v_pure/v_pure.qss
+++ b/src/resources/themes/v_pure/v_pure.qss
@@ -786,6 +786,12 @@ QTreeView::item {
     padding-bottom: 5px;
 }
 
+QTreeView[ItemBorder="true"]::item {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    border-bottom: 1px solid @treeview_item_border_bg;
+}
+
 QTreeView::item:hover {
     color: @treeview_item_hover_fg;
     background: @treeview_item_hover_bg;
@@ -829,6 +835,30 @@ QTreeView::branch:open:has-children:has-siblings  {
     border-image: none;
     image: url(branch_open.svg);
 }
+
+QTreeView[PlainTree="true"]::branch:has-siblings:!adjoins-item {
+    border-image: none;
+}
+
+QTreeView[PlainTree="true"]::branch:has-siblings:adjoins-item {
+    border-image: none;
+}
+
+QTreeView[PlainTree="true"]::branch:!has-children:!has-siblings:adjoins-item {
+    border-image: none;
+}
+
+QTreeView[PlainTree="true"]::branch:has-children:!has-siblings:closed,
+QTreeView[PlainTree="true"]::branch:closed:has-children:has-siblings {
+    border-image: none;
+    image: none;
+}
+
+QTreeView[PlainTree="true"]::branch:open:has-children:!has-siblings,
+QTreeView[PlainTree="true"]::branch:open:has-children:has-siblings  {
+    border-image: none;
+    image: none;
+}
 /* End QTreeView */
 
 /* QListView */
diff --git a/src/resources/themes/v_white/v_white.palette b/src/resources/themes/v_white/v_white.palette
index 687555ec..7660d327 100644
--- a/src/resources/themes/v_white/v_white.palette
+++ b/src/resources/themes/v_white/v_white.palette
@@ -234,6 +234,7 @@ insertselector_bg=@base_bg
 ; TreeView.
 treeview_fg=@content_fg
 treeview_bg=@content_bg
+treeview_item_border_bg=@border_bg
 treeview_item_hover_fg=@hover_fg
 treeview_item_hover_bg=@hover_bg
 treeview_item_selected_fg=@selected_fg
diff --git a/src/resources/themes/v_white/v_white.qss b/src/resources/themes/v_white/v_white.qss
index 88af5b6f..b64b584e 100644
--- a/src/resources/themes/v_white/v_white.qss
+++ b/src/resources/themes/v_white/v_white.qss
@@ -687,6 +687,12 @@ QTreeView::item {
     padding-bottom: 5px;
 }
 
+QTreeView[ItemBorder="true"]::item {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    border-bottom: 1px solid @treeview_item_border_bg;
+}
+
 QTreeView::item:hover {
     color: @treeview_item_hover_fg;
     background: @treeview_item_hover_bg;
@@ -730,6 +736,30 @@ QTreeView::branch:open:has-children:has-siblings  {
     border-image: none;
     image: url(branch_open.svg);
 }
+
+QTreeView[PlainTree="true"]::branch:has-siblings:!adjoins-item {
+    border-image: none;
+}
+
+QTreeView[PlainTree="true"]::branch:has-siblings:adjoins-item {
+    border-image: none;
+}
+
+QTreeView[PlainTree="true"]::branch:!has-children:!has-siblings:adjoins-item {
+    border-image: none;
+}
+
+QTreeView[PlainTree="true"]::branch:has-children:!has-siblings:closed,
+QTreeView[PlainTree="true"]::branch:closed:has-children:has-siblings {
+    border-image: none;
+    image: none;
+}
+
+QTreeView[PlainTree="true"]::branch:open:has-children:!has-siblings,
+QTreeView[PlainTree="true"]::branch:open:has-children:has-siblings  {
+    border-image: none;
+    image: none;
+}
 /* End QTreeView */
 
 /* QListView */
diff --git a/src/vvimindicator.cpp b/src/vvimindicator.cpp
index 520a322e..eed512c6 100644
--- a/src/vvimindicator.cpp
+++ b/src/vvimindicator.cpp
@@ -105,6 +105,8 @@ void VVimIndicator::setupUI()
     m_modeLabel->setProperty("VimIndicatorModeLabel", true);
 
     QTreeWidget *regTree = new QTreeWidget(this);
+    regTree->setProperty("ItemBorder", true);
+    regTree->setRootIsDecorated(false);
     regTree->setColumnCount(2);
     regTree->header()->setStretchLastSection(true);
     QStringList headers;
@@ -121,6 +123,8 @@ void VVimIndicator::setupUI()
             this, &VVimIndicator::updateRegistersTree);
 
     QTreeWidget *markTree = new QTreeWidget(this);
+    markTree->setProperty("ItemBorder", true);
+    markTree->setRootIsDecorated(false);
     markTree->setColumnCount(4);
     markTree->header()->setStretchLastSection(true);
     headers.clear();