diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-09 00:54:24 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-09 00:54:24 +0200 |
| commit | 33150f64428ba2a1ca6b6328b606cdbb37bf8006 (patch) | |
| tree | b704d37d46e5f15fb30c00483027e7e00350ca22 /src/mainview.cpp | |
| parent | Merge branch 'm155' (diff) | |
| parent | Added option to detachTab() to allow moving to existing window (diff) | |
| download | rekonq-33150f64428ba2a1ca6b6328b606cdbb37bf8006.tar.xz | |
Merge commit 'refs/merge-requests/158' of git://gitorious.org/rekonq/mainline into m158
Diffstat (limited to 'src/mainview.cpp')
| -rw-r--r-- | src/mainview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp index 335bcfae..1965e321 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -704,7 +704,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 +725,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(); |