1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 12:46:35 +01:00

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

This commit is contained in:
S. Razi Alavizadeh 2013-03-03 23:34:21 +03:30
parent 50e993e014
commit f6f604698d
8 changed files with 45 additions and 0 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 247 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 159 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 157 B

After

Width:  |  Height:  |  Size: 245 B

View File

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

View File

@ -7,11 +7,42 @@
max-height: 27px; max-height: 27px;
} }
#tab-icon
{
padding-right: 3px;
padding-left: 3px;
min-width: 16px;
max-width: 16px;
}
#tabbar::tab #tabbar::tab
{ {
height: 26px; 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*/ /*Downloads*/
DownloadItem #progressBar DownloadItem #progressBar
{ {

View File

@ -744,6 +744,7 @@ void QupZilla::loadSettings()
if (m_usingTransparentBackground && !makeTransparent) { if (m_usingTransparentBackground && !makeTransparent) {
QtWin::extendFrameIntoClientArea(this, 0, 0, 0, 0); QtWin::extendFrameIntoClientArea(this, 0, 0, 0, 0);
QtWin::enableBlurBehindWindow(this, false); QtWin::enableBlurBehindWindow(this, false);
QtWin::enableBlurBehindWindow(m_tabWidget->getTabBar(), false);
m_usingTransparentBackground = false; m_usingTransparentBackground = false;
} }
#endif #endif
@ -770,6 +771,9 @@ void QupZilla::loadSettings()
m_usingTransparentBackground = true; m_usingTransparentBackground = true;
if (!qzSettings->tabsOnTop) {
QtWin::enableBlurBehindWindow(m_tabWidget->getTabBar(), true);
}
applyBlurToMainWindow(); applyBlurToMainWindow();
update(); update();
@ -1591,6 +1595,9 @@ void QupZilla::triggerTabsOnTop(bool enable)
Settings settings; Settings settings;
settings.setValue("Browser-Tabs-Settings/TabsOnTop", enable); settings.setValue("Browser-Tabs-Settings/TabsOnTop", enable);
if (m_usingTransparentBackground) {
QtWin::enableBlurBehindWindow(m_tabWidget->getTabBar(), !enable);
}
qzSettings->tabsOnTop = enable; qzSettings->tabsOnTop = enable;
} }

View File

@ -471,6 +471,7 @@ void TabWidget::startTabAnimation(int index)
QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, m_tabBar->iconButtonPosition())); QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, m_tabBar->iconButtonPosition()));
if (!label) { if (!label) {
label = new QLabel(); label = new QLabel();
label->setObjectName("tab-icon");
m_tabBar->setTabButton(index, m_tabBar->iconButtonPosition(), label); 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())); QLabel* label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, m_tabBar->iconButtonPosition()));
if (!label) { if (!label) {
label = new QLabel(); label = new QLabel();
label->setObjectName("tab-icon");
label->resize(16, 16); label->resize(16, 16);
m_tabBar->setTabButton(index, m_tabBar->iconButtonPosition(), label); m_tabBar->setTabButton(index, m_tabBar->iconButtonPosition(), label);
} }