From 8820703a2e76fe9a340e0bfeac61f9df40938b15 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Thu, 7 Mar 2013 17:26:21 +0100
Subject: [PATCH] [Windows] Small theme improvements of tab style.

Using transparent background for tabbar also with tabs on top.
---
 bin/themes/windows/images/tab-deactive-bg.png   | Bin 159 -> 112 bytes
 .../windows/images/tab-deactive-hover-bg.png    | Bin 0 -> 130 bytes
 bin/themes/windows/images/tabs-list-button.png  | Bin 704 -> 151 bytes
 .../windows/images/tabs-list-button_rtl.png     | Bin 704 -> 0 bytes
 bin/themes/windows/main.css                     |   8 +++++++-
 bin/themes/windows/rtl.css                      |   5 -----
 bin/themes/windows/windows.css                  |   8 ++++++++
 src/lib/app/qupzilla.cpp                        |   8 +-------
 8 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 bin/themes/windows/images/tab-deactive-hover-bg.png
 delete mode 100644 bin/themes/windows/images/tabs-list-button_rtl.png

diff --git a/bin/themes/windows/images/tab-deactive-bg.png b/bin/themes/windows/images/tab-deactive-bg.png
index 8a33fc1f645328cd4094d9a977a8a79a26245023..3168d71a56c1d5fce454d99265f59ba51cc91b2c 100644
GIT binary patch
delta 35
pcmbQwSTI3_(R`w>u|&}2l?>~*8tp#a#}dx~1fH&bF6*2UngH7U3-bT~

delta 82
zcmXSz&p1Ivle54hvY3H^?=T269?xHq!oa}5UgGKN%6^xbQCvfISJe3=ppe}}Rb%-{
iZ$pkv&#zm^$;fa&z_gQpudO{$iow&>&t;ucLK6ViMi_Je

diff --git a/bin/themes/windows/images/tab-deactive-hover-bg.png b/bin/themes/windows/images/tab-deactive-hover-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c30080dfac8b44e974eab635fa92d79753ba96d
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol|!2~3itE^N6Ql6eJjv*44=k^=&F(_~_U;OYt
zewX#k43;@tWjlJNXE$y-^HlDwaoiUxrB{vuEWEniKH?j1Y0T^mSSG!O>%W1^u6@lS
f55La4S;6orO84kKtH)MALm50>{an^LB{Ts5cIGUG

literal 0
HcmV?d00001

diff --git a/bin/themes/windows/images/tabs-list-button.png b/bin/themes/windows/images/tabs-list-button.png
index 5f862f7e16d980ac03320189cb67f6a38ce1e607..7ec122da63ee5e6b97a4268e3cc39f5ae5469664 100644
GIT binary patch
delta 136
zcmX@WI-OCmGr-TCmrII^fq{Y7)59eQNOJ-)7Y7@VOk*wCH_<^N&ePMyF+}2Wa)Lxn
zgW$1_zP^9@8X6}KoH=vm!}s^`ZQtMDH`a;WHAT=>keQkJ@RO61|95wG8t$q3+NEf2
mK3#D6#o%Q=KkX0fV`kWHBD`<nsc1={;S8RxelF{r5}E+JV=@~6

delta 693
zcmV;m0!sat0l)=7iBL{Q4GJ0x0000DNk~Le0000H0001N2nGNE0F2RD<p2Nx0drDE
zLIAGL9O(c600v@9M??Vs0RI60puMM)ks%m=2XskIMF-pg1`rSrcX+HQ0006&Nkl<Z
zSi|j=F>4e-6vuyWX6_8;5;@c(U>Xsu(o2vND=}aSzky9+DI!?<0rC+{V{fUZ5L+RU
zd<79Ch$PB+xxL+JGV?6%Ht|jg$80K@|5nR9e!MrcJ3rZYw@uZEs#b=$stgfup(4e9
zAh?~K9sRJiNuKBN<7{ni(r(}4a;p^uum)UF<TM%$x<9&cT{yu3gb?r{#O;ZiAw<E)
zF{mLYkPsqINwpkD@sSXP0Yp_$mDta%glPOY$DItH$VSRes%-2Kvfukjr(2AyWxXyh
z*4Jn@n^<e{-qY!Hc(C%6#>|D|y6Gu@TaFV@{0L-bc7{h!p0V}*Ev;6I-Q8Vo+`L1e
zM$nU5?>%NP*58jRD0LRwOYH6KvDjWhsiQhpU+#%9g0<$~BTJ3N_FV!s#3&XSyH89B
zF<4_xxp>ZDR0lWE_?nSFAlAnHfHH(wBRFf~AY~_F3?>pHC!H8v>^R1p<(`Ot;7sIS
zTpsbpo0rw()tX-rDkf<(X*6l{j5T_2Bpd}HsGtK|VnlI9nQ}UrMi0Gk7z7`LpkQS1
zVW}#0qmya$)7OmWuRe0VaS3rX^yrX0`^M_>HLlJzCe!GZxh89mZ?pdT3)8a~>F<AM
z<=z5CmZ2O>rcv)b{a()M@;pUs=QFFz^YnW;-uuZlT0`*aDf)dL-oH+k^$|SIj@F*4
z(K_H26wj|B$Kr7otT0l0szyg&J=o!SjtM<!G-)(xG-)(xG-)(xG->p|)o4meN=iyf
bN_2h$mvz%2e;cGE00000NkvXXu0mjf|Iaw4

diff --git a/bin/themes/windows/images/tabs-list-button_rtl.png b/bin/themes/windows/images/tabs-list-button_rtl.png
deleted file mode 100644
index ee615d7a48d0e656c6a0f80b636c8c4c8b785576..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq000pH003+V1^@s6jL});00009a7bBm000XT
z000XT0n*)m`~Uy~a!Eu%R9J=WmA!5gK@>*Mof#Ws43P!0B9R6mQKcqCC=wMS5-E5C
znuMB$hsYz422xXiKu91e0!1WV0U;5Dh#jzS)^>tDb1D2E+aat|&Nsytvvc;|o!LF|
z`rRj{ji~C>5C<?V$EiY?lHxWupQa|{ayhOq+(1GI>O(q6xm03n>piYot<q|xD<+@M
z(`eLjK@}g;l@dDZ90+OK37rNUs)UfPogPF1pBB<t=Ri=ERFLjEH%R<{NVgIJB_)I|
zM5n2weRYS2E%tsjdK1b1Z=P(dQz#U$*5bXVQmJr%^%42=GeZ#X+gI87wyQh4NpHf4
zU}&=a@h!z-ky5F|!p++RG9w>qVJ64+hc_4zkb$8JN|wc?Wy<9;i%ZKWSyYGb>ka@X
zVzAbX_A40{m+lbAAV#r_9s^^#5F=PK3IPx~gHZ(;e~wINoiid>YscR7uk;~CaAVpz
zNo=nj5ll*m^eZvAl<nA4eJ6;)nRI_8+u1eu;`y^wfWf%p+<dy9$v~n;`-vJI1Bn_P
z1DT-FgO<<=LQp{g0gNclC}-X9!zOC9>4jzxd=P?y5wNEH)T}uInWWJ#KN23l{7f!?
z32_;;)uf*6v9@xRE3^3_NLQoIdynFK6PITTtUtWP#;fm~yKs?O^(U)$=V>Gf%E6I#
z+6QbzquzUJ`*qe<=4e#DvbHiuZNHB9{^T0XAb9mOYBe6*yGD}K5IoMxh;AopGz)kI
z#q+08$Kr7otT3Y6i5eZYhX)JojUFfTsL`W|8a<{Gh#KuAYV;UL)My_PH5xT~f<%pu
mspK>@8WR%}6B84YI)4FehxqGhF>Y`G0000<MNUMnLSTY!1Tu^O

diff --git a/bin/themes/windows/main.css b/bin/themes/windows/main.css
index 304453439..bd14febd0 100644
--- a/bin/themes/windows/main.css
+++ b/bin/themes/windows/main.css
@@ -110,7 +110,13 @@
 
 #tabwidget-button-opentabs
 {
-    qproperty-multiIcon: url(images/tabs-list-button.png);
+    qproperty-icon: url(images/tabs-list-button.png);
+    qproperty-fixedsize: 18px 28px;
+}
+
+#tabwidget-button-opentabs::menu-indicator
+{
+    background: url(images/transp.png);
 }
 
 #tabwidget-button-addtab
diff --git a/bin/themes/windows/rtl.css b/bin/themes/windows/rtl.css
index f54eda666..1d9c66241 100644
--- a/bin/themes/windows/rtl.css
+++ b/bin/themes/windows/rtl.css
@@ -8,11 +8,6 @@
     qproperty-multiIcon: url(images/navigation-forward.png);
 }
 
-#tabwidget-button-opentabs
-{
-    qproperty-multiIcon: url(images/tabs-list-button_rtl.png);
-}
-
 #tabwidget-button-addtab
 {
     qproperty-multiIcon: url(images/tabbar-addtab_rtl.png);
diff --git a/bin/themes/windows/windows.css b/bin/themes/windows/windows.css
index ed1dbfd89..fcba2d01a 100644
--- a/bin/themes/windows/windows.css
+++ b/bin/themes/windows/windows.css
@@ -37,6 +37,14 @@
     border: 1px solid #a6a6a6;
 }
 
+#tabbar::tab:!selected:hover
+{
+    background: url(images/tab-deactive-hover-bg.png) repeat-x;
+    margin-top: 2px;
+    margin-bottom: -3px;
+    border: 1px solid #3c7fb1;
+}
+
 #tabbar::tab:last
 {
     margin-right: -1px;
diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp
index 3a38d33db..826dd2721 100644
--- a/src/lib/app/qupzilla.cpp
+++ b/src/lib/app/qupzilla.cpp
@@ -771,9 +771,7 @@ void QupZilla::loadSettings()
 
         m_usingTransparentBackground = true;
 
-        if (!qzSettings->tabsOnTop) {
-            QtWin::enableBlurBehindWindow(m_tabWidget->getTabBar(), true);
-        }
+        QtWin::enableBlurBehindWindow(m_tabWidget->getTabBar(), true);
         applyBlurToMainWindow();
         update();
 
@@ -1594,10 +1592,6 @@ void QupZilla::triggerTabsOnTop(bool enable)
 
     Settings settings;
     settings.setValue("Browser-Tabs-Settings/TabsOnTop", enable);
-
-    if (m_usingTransparentBackground) {
-        QtWin::enableBlurBehindWindow(m_tabWidget->getTabBar(), !enable);
-    }
     qzSettings->tabsOnTop = enable;
 }