diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-23 03:11:26 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-23 03:11:26 +0100 |
| commit | df7a2820a54d8b69e87b495269b88f9ae5ac156d (patch) | |
| tree | 4124db211bddf2dbf784d0eddbf70bbb8c24ee0f /src/tabbar.cpp | |
| parent | Fixing urlbar size (diff) | |
| parent | Saving 4 bytes per tab :) (diff) | |
| download | rekonq-df7a2820a54d8b69e87b495269b88f9ae5ac156d.tar.xz | |
Merge branch 'devAdBlock'
Diffstat (limited to 'src/tabbar.cpp')
| -rw-r--r-- | src/tabbar.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/tabbar.cpp b/src/tabbar.cpp index 3eba53d7..6fdf4346 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -38,6 +38,7 @@ #include "urlbar.h" #include "webview.h" #include "websnap.h" +#include "mainview.h" // KDE Includes #include <KShortcut> @@ -59,9 +60,8 @@ #define MIN_WIDTH_DIVISOR 8 -TabBar::TabBar(MainView *parent) +TabBar::TabBar(QWidget *parent) : KTabBar(parent) - , m_parent(parent) , m_currentTabPreview(-1) { setElideMode(Qt::ElideRight); @@ -84,10 +84,12 @@ TabBar::~TabBar() QSize TabBar::tabSizeHint(int index) const { - int buttonSize = m_parent->addTabButton()->size().width(); - int tabBarWidth = m_parent->size().width() - buttonSize; - int baseWidth = m_parent->sizeHint().width()/BASE_WIDTH_DIVISOR; - int minWidth = m_parent->sizeHint().width()/MIN_WIDTH_DIVISOR; + MainView *view = qobject_cast<MainView *>(parent()); + + int buttonSize = view->addTabButton()->size().width(); + int tabBarWidth = view->size().width() - buttonSize; + int baseWidth = view->sizeHint().width()/BASE_WIDTH_DIVISOR; + int minWidth = view->sizeHint().width()/MIN_WIDTH_DIVISOR; int w; if (baseWidth*count()<tabBarWidth) @@ -139,8 +141,10 @@ void TabBar::reloadTab() void TabBar::showTabPreview(int tab) { - WebView *view = m_parent->webView(tab); - WebView *currentView = m_parent->webView(currentIndex()); + MainView *mv = qobject_cast<MainView *>(parent()); + + WebView *view = mv->webView(tab); + WebView *currentView = mv->webView(currentIndex()); // should fix bug #212219 if(!currentView) |