Merge pull request #782 from srazi/windows-theme

[Win] Improved "windows" theme+transparent TabBar's background

bin/themes/windows/rtl.css

@@ -17,3 +17,8 @@
 {
     qproperty-multiIcon: url(images/tabbar-addtab_rtl.png);
 }
+
+#tabbar::tab:last
+{
+    margin-left: 1px;
+}

bin/themes/windows/windows.css

@@ -7,11 +7,42 @@
     max-height: 27px;
 }
 
+#tab-icon
+{
+    padding-right: 3px;
+    padding-left: 3px;
+    min-width: 16px;
+    max-width: 16px;
+}
+
 #tabbar::tab
 {
     height: 26px;
 }
 
+#tabbar::tab:selected
+{
+    background : url(images/tab-active-bg.png) repeat-x;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    border: 1px solid #606060;
+    border-bottom: none;
+}
+
+#tabbar::tab:!selected
+{
+    background: url(images/tab-deactive-bg.png) repeat-x;
+    margin-top: 2px;
+    margin-bottom: -3px;
+    border: 1px solid #a6a6a6;
+}
+
+#tabbar::tab:last
+{
+    margin-right: -1px;
+}
+
+
 /*Downloads*/
 DownloadItem #progressBar
 {

src/lib/app/qupzilla.cpp

@@ -744,6 +744,7 @@ void QupZilla::loadSettings()
     if (m_usingTransparentBackground && !makeTransparent) {
         QtWin::extendFrameIntoClientArea(this, 0, 0, 0, 0);
         QtWin::enableBlurBehindWindow(this, false);
+        QtWin::enableBlurBehindWindow(m_tabWidget->getTabBar(), false);
         m_usingTransparentBackground = false;
     }
 #endif
@@ -770,6 +771,9 @@ void QupZilla::loadSettings()
 
         m_usingTransparentBackground = true;
 
+        if (!qzSettings->tabsOnTop) {
+            QtWin::enableBlurBehindWindow(m_tabWidget->getTabBar(), true);
+        }
         applyBlurToMainWindow();
         update();
 
@@ -1591,6 +1595,9 @@ 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;
 }
 

src/lib/webview/tabwidget.cpp

@@ -471,6 +471,7 @@ void TabWidget::startTabAnimation(int index)
     QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, m_tabBar->iconButtonPosition()));
     if (!label) {
         label = new QLabel();
+        label->setObjectName("tab-icon");
         m_tabBar->setTabButton(index, m_tabBar->iconButtonPosition(), label);
     }
 
@@ -515,6 +516,7 @@ void TabWidget::setTabIcon(int index, const QIcon &icon)
     QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, m_tabBar->iconButtonPosition()));
     if (!label) {
         label = new QLabel();
+        label->setObjectName("tab-icon");
         label->resize(16, 16);
         m_tabBar->setTabButton(index, m_tabBar->iconButtonPosition(), label);
     }