Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[Fix:] Opening link (target=blank) in new selected tab (regression)

Browse Source
This commit is contained in:
nowrep 2011-12-05 16:12:48 +01:00
parent 820e87594f
commit d5c9b40601
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/webview/tabwidget.cpp
View File

@ -245,7 +245,7 @@ int TabWidget::addView(QUrl url, const QString &title, OpenUrlIn openIn, bool se
{ {
m_lastTabIndex = currentIndex(); m_lastTabIndex = currentIndex();
if (url.isEmpty() && openIn != CleanPage) { if (url.isEmpty() && openIn != CleanPage && openIn != CleanSelectedPage) {
url = m_urlOnNewTab; url = m_urlOnNewTab;
} }
@ -259,7 +259,7 @@ int TabWidget::addView(QUrl url, const QString &title, OpenUrlIn openIn, bool se
webView->animationLoading(index, true)->movie()->stop(); webView->animationLoading(index, true)->movie()->stop();
webView->animationLoading(index, false)->setPixmap(_iconForUrl(url).pixmap(16, 16)); webView->animationLoading(index, false)->setPixmap(_iconForUrl(url).pixmap(16, 16));
if (openIn == TabWidget::NewSelectedTab) { if (openIn == NewSelectedTab || openIn == CleanSelectedPage) {
setCurrentIndex(index); setCurrentIndex(index);
} }
@ -289,7 +289,7 @@ int TabWidget::addView(QUrl url, const QString &title, OpenUrlIn openIn, bool se
p_QupZilla->locationBar()->setFocus(); p_QupZilla->locationBar()->setFocus();
} }
if (openIn == NewSelectedTab) { if (openIn == NewSelectedTab || openIn == CleanSelectedPage) {
m_isClosingToLastTabIndex = true; m_isClosingToLastTabIndex = true;
m_locationBars->setCurrentWidget(locBar); m_locationBars->setCurrentWidget(locBar);
} }

2
src/webview/tabwidget.h
View File

@ -43,7 +43,7 @@ class TabWidget : public QTabWidget
public: public:
explicit TabWidget(QupZilla* mainclass, QWidget* parent = 0); explicit TabWidget(QupZilla* mainclass, QWidget* parent = 0);
~TabWidget(); ~TabWidget();
enum OpenUrlIn { CurrentTab, NewSelectedTab, NewNotSelectedTab, NewTab = NewSelectedTab, CleanPage }; enum OpenUrlIn { CurrentTab, NewSelectedTab, NewNotSelectedTab, NewTab = NewSelectedTab, CleanPage, CleanSelectedPage };
QByteArray saveState(); QByteArray saveState();
bool restoreState(const QByteArray &state); bool restoreState(const QByteArray &state);

2
src/webview/webpage.cpp
View File

@ -213,7 +213,7 @@ QWebPage* WebPage::createWindow(QWebPage::WebWindowType type)
// view->show(); // view->show();
// return view->page(); // return view->page();
Q_UNUSED(type); Q_UNUSED(type);
int index = p_QupZilla->tabWidget()->addView(QUrl(), tr("New tab"), TabWidget::CleanPage); int index = p_QupZilla->tabWidget()->addView(QUrl(), tr("New tab"), TabWidget::CleanSelectedPage);
return p_QupZilla->weView(index)->page(); return p_QupZilla->weView(index)->page();
} }