From 901a430f560c9401d2f389518ababf5360b1bd43 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 29 Dec 2011 10:59:14 +0100 Subject: Get sure tabbar is well shown (and hided) during fullscreen navigation --- src/mainview.cpp | 20 ++++++++++++-------- src/mainwindow.cpp | 3 +++ 2 files changed, 15 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/mainview.cpp b/src/mainview.cpp index c98e030a..5e616ff7 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -142,17 +142,21 @@ void MainView::updateTabBar() { if (ReKonfig::alwaysShowTabBar() || count() > 1) { - if (tabBar()->isHidden()) + // Get sure tabbar is well shown (and hided) during fullscreen navigation + MainWindow *w = qobject_cast(parent()); + if (w && !w->isFullScreen()) { - tabBar()->show(); - } + if (tabBar()->isHidden()) + { + tabBar()->show(); + } - // this to ensure tab button visibility also on new window creation - if (m_addTabButton->isHidden()) - { - m_addTabButton->show(); + // this to ensure tab button visibility also on new window creation + if (m_addTabButton->isHidden()) + { + m_addTabButton->show(); + } } - } else { diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 4f65c205..01310bfb 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -930,6 +930,7 @@ void MainWindow::updateHighlight() } } + void MainWindow::findSelectedText() { // FindBar::setVisible() gets the selected text by itself @@ -943,11 +944,13 @@ void MainWindow::viewFullScreen(bool makeFullScreen) KToggleFullScreenAction::setFullScreen(this, makeFullScreen); } + void MainWindow::openDownloadsPage() { rApp->loadUrl(KUrl("about:downloads"), Rekonq::NewFocusedTab); } + void MainWindow::setWidgetsVisible(bool makeVisible) { // state flags -- cgit v1.2.1