Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

TabBar: Don't use ProxyStyle directly

Browse Source
This commit is contained in:
David Rosca 2015-06-11 21:07:11 +02:00
parent 0723deb2fc
commit a0b84a5cd3
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/tabwidget/tabbar.cpp
View File

@ -25,7 +25,6 @@
#include "tabbedwebview.h" #include "tabbedwebview.h"
#include "mainapplication.h" #include "mainapplication.h"
#include "pluginproxy.h" #include "pluginproxy.h"
#include "proxystyle.h"
#include "iconprovider.h" #include "iconprovider.h"
#include <QMenu> #include <QMenu>
@ -150,11 +149,9 @@ void TabBar::closeAllButCurrent()
QSize TabBar::tabSizeHint(int index, bool fast) const QSize TabBar::tabSizeHint(int index, bool fast) const
{ {
if (!isVisible() || !mApp->proxyStyle()) { if (!isVisible()) {
// Don't calculate it when tabbar is not visible // Don't calculate it when tabbar is not visible
// It produces invalid size anyway // It produces invalid size anyway
//
// We also need ProxyStyle to be set before calculating minimum sizes for tabs
return QSize(-1, -1); return QSize(-1, -1);
} }
@ -266,13 +263,12 @@ QSize TabBar::tabSizeHint(int index, bool fast) const
int TabBar::comboTabBarPixelMetric(ComboTabBar::SizeType sizeType) const int TabBar::comboTabBarPixelMetric(ComboTabBar::SizeType sizeType) const
{ {
if (!mApp->proxyStyle() || !isVisible()) { if (!isVisible())
return -1; return -1;
}
switch (sizeType) { switch (sizeType) {
case ComboTabBar::PinnedTabWidth: case ComboTabBar::PinnedTabWidth:
return 16 + mApp->proxyStyle()->pixelMetric(QStyle::PM_TabBarTabHSpace, 0, this); return 16 + style()->pixelMetric(QStyle::PM_TabBarTabHSpace, 0, this);
case ComboTabBar::ActiveTabMinimumWidth: case ComboTabBar::ActiveTabMinimumWidth:
case ComboTabBar::NormalTabMinimumWidth: case ComboTabBar::NormalTabMinimumWidth: