summaryrefslogtreecommitdiff
path: root/src/mainview.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-12-28 12:22:31 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-12-28 12:22:31 +0100
commitf501b1436b61219129e8a5608f5f814ea9abaf31 (patch)
treec7467d1fd0662c9a94262cd8427cb82620401123 /src/mainview.cpp
parentMerge Request #79 with the changes discussed. (diff)
parentMerge commit 'refs/merge-requests/81' of git://gitorious.org/rekonq/mainline ... (diff)
downloadrekonq-f501b1436b61219129e8a5608f5f814ea9abaf31.tar.xz
Merge branch 'm81'
Diffstat (limited to 'src/mainview.cpp')
-rw-r--r--src/mainview.cpp20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 2123d021..7dbe8b23 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -186,12 +186,15 @@ void MainView::updateTabBar()
{
if (ReKonfig::alwaysShowTabBar())
{
- if (m_tabBar->isHidden())
+ if (!isTabBarHidden())
{
- m_tabBar->show();
- m_addTabButton->show();
+ if (m_tabBar->isHidden())
+ {
+ m_tabBar->show();
+ m_addTabButton->show();
+ }
+ updateTabButtonPosition();
}
- updateTabButtonPosition();
return;
}
@@ -200,7 +203,7 @@ void MainView::updateTabBar()
m_tabBar->hide();
m_addTabButton->hide();
}
- else
+ else if (!isTabBarHidden())
{
if (m_tabBar->isHidden())
{
@@ -212,6 +215,13 @@ void MainView::updateTabBar()
}
+void MainView::setTabBarHidden(bool hide)
+{
+ m_addTabButton->setVisible(!hide);
+ KTabWidget::setTabBarHidden(hide);
+}
+
+
void MainView::webReload()
{
WebTab *webTab = currentWebTab();