diff options
Diffstat (limited to 'src/mainview.cpp')
-rw-r--r-- | src/mainview.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp index 335bcfae..dc759c9e 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -293,10 +293,6 @@ void MainView::currentChanged(int index) else emit browserTabLoading(true); - // update zoom slider - if (!Application::instance()->mainWindowList().isEmpty()) - Application::instance()->mainWindow()->setZoomSliderFactor(tab->view()->zoomFactor()); - // set focus to the current webview if (tab->url().scheme() == QL1S("about")) _widgetBar->currentWidget()->setFocus(); @@ -329,7 +325,6 @@ WebTab *MainView::newWebTab(bool focused) connect(tab->view(), SIGNAL(iconChanged()), this, SLOT(webViewIconChanged())); connect(tab->view(), SIGNAL(titleChanged(const QString &)), this, SLOT(webViewTitleChanged(const QString &))); connect(tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(webViewUrlChanged(const QUrl &))); - connect(tab->view(), SIGNAL(zoomChanged(qreal)), m_parentWindow, SLOT(setZoomSliderFactor(qreal))); // connecting webPage signals with mainview connect(tab->view()->page(), SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested())); @@ -704,7 +699,7 @@ void MainView::resizeEvent(QResizeEvent *event) } -void MainView::detachTab(int index) +void MainView::detachTab(int index, MainWindow *toWindow) { if (index < 0) index = currentIndex(); @@ -725,7 +720,11 @@ void MainView::detachTab(int index) UrlBar *bar = _widgetBar->urlBar(index); closeTab(index, false); - MainWindow *w = Application::instance()->newMainWindow(false); + MainWindow *w; + if( toWindow == NULL ) + w = Application::instance()->newMainWindow(false); + else + w = toWindow; w->mainView()->addTab(tab, Application::icon(u), label); w->mainView()->widgetBar()->insertWidget(0, bar); w->mainView()->updateTabBar(); |