Reviewed by Andreas Kling.
[Qt] QtTestBrowser: User input lost when toggling use of QGraphicsView
https://bugs.webkit.org/show_bug.cgi?id=48440
Preserve user input when toggling use of QGraphicsView
* QtTestBrowser/launcherwindow.cpp:
(LauncherWindow::initializeView):
(LauncherWindow::loadFinished):
* QtTestBrowser/launcherwindow.h:
* QtTestBrowser/mainwindow.cpp:
(MainWindow::addressUrl):
* QtTestBrowser/mainwindow.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76860
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2011-01-27 Jacob Dinu <dinu.jacob@nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] QtTestBrowser: User input lost when toggling use of QGraphicsView
+ https://bugs.webkit.org/show_bug.cgi?id=48440
+
+ Preserve user input when toggling use of QGraphicsView
+
+ * QtTestBrowser/launcherwindow.cpp:
+ (LauncherWindow::initializeView):
+ (LauncherWindow::loadFinished):
+ * QtTestBrowser/launcherwindow.h:
+ * QtTestBrowser/mainwindow.cpp:
+ (MainWindow::addressUrl):
+ * QtTestBrowser/mainwindow.h:
+
2011-01-27 Dirk Pranke <dpranke@chromium.org>
Reviewed by Mihai Parparita.
{
delete m_view;
+ m_inputUrl = addressUrl();
QUrl url = page()->mainFrame()->url();
setPage(new WebPage(this));
page()->setQnamThreaded(m_windowOptions.useThreadedQnam);
if (url.isValid())
page()->mainFrame()->load(url);
+ else {
+ setAddressUrl(m_inputUrl);
+ m_inputUrl = QString();
+ }
}
void LauncherWindow::applyPrefs()
void LauncherWindow::loadFinished()
{
QUrl url = page()->mainFrame()->url();
- setAddressUrl(url.toString(QUrl::RemoveUserInfo));
addCompleterEntry(url);
+ if (m_inputUrl.isEmpty())
+ setAddressUrl(url.toString(QUrl::RemoveUserInfo));
+ else {
+ setAddressUrl(m_inputUrl);
+ m_inputUrl = QString();
+ }
}
void LauncherWindow::showLinkHover(const QString &link, const QString &toolTip)
QPropertyAnimation* m_zoomAnimation;
QList<QTouchEvent::TouchPoint> m_touchPoints;
bool m_touchMocking;
+
+ QString m_inputUrl;
};
#endif
page()->mainFrame()->load(url);
}
+QString MainWindow::addressUrl() const
+{
+#ifndef QT_NO_INPUTDIALOG
+ return urlEdit->text();
+#endif
+ return QString();
+}
+
void MainWindow::changeLocation()
{
#ifndef QT_NO_INPUTDIALOG
void openLocation();
void changeLocation();
+protected:
+ QString addressUrl() const;
+
private:
void buildUI();