diff options
9 files changed, 102 insertions, 7 deletions
diff --git a/examples/webenginewidgets/contentmanipulation/main.cpp b/examples/webenginewidgets/contentmanipulation/main.cpp index 5645f9b9a..e816079d2 100644 --- a/examples/webenginewidgets/contentmanipulation/main.cpp +++ b/examples/webenginewidgets/contentmanipulation/main.cpp @@ -63,6 +63,7 @@ int main(int argc, char * argv[]) else url = QUrl("http://www.google.com/ncr"); MainWindow *browser = new MainWindow(url); + browser->resize(1024, 768); browser->show(); return app.exec(); } diff --git a/examples/webenginewidgets/cookiebrowser/main.cpp b/examples/webenginewidgets/cookiebrowser/main.cpp index ae208c824..0ae5433ba 100644 --- a/examples/webenginewidgets/cookiebrowser/main.cpp +++ b/examples/webenginewidgets/cookiebrowser/main.cpp @@ -57,6 +57,7 @@ int main(int argc, char *argv[]) QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); MainWindow window(QUrl("http://qt.io")); + window.resize(1024, 768); window.show(); return app.exec(); } diff --git a/examples/webenginewidgets/maps/main.cpp b/examples/webenginewidgets/maps/main.cpp index f62518274..cad9c7ea9 100644 --- a/examples/webenginewidgets/maps/main.cpp +++ b/examples/webenginewidgets/maps/main.cpp @@ -57,6 +57,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); MainWindow mainWindow; + mainWindow.resize(1024, 768); mainWindow.show(); return app.exec(); diff --git a/examples/webenginewidgets/stylesheetbrowser/mainwindow.ui b/examples/webenginewidgets/stylesheetbrowser/mainwindow.ui index f9c1af969..bc68c16bb 100644 --- a/examples/webenginewidgets/stylesheetbrowser/mainwindow.ui +++ b/examples/webenginewidgets/stylesheetbrowser/mainwindow.ui @@ -18,11 +18,47 @@ </property> <widget class="QWidget" name="centralWidget"> <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <widget class="QWidget" name="webContentsWidget" native="true"> <layout class="QVBoxLayout" name="verticalLayout_3"> + <property name="spacing"> + <number>0</number> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <widget class="QWidget" name="urlBarWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> <widget class="QLineEdit" name="urlBar"/> @@ -32,13 +68,13 @@ <property name="text"> <string/> </property> - <property name="shortcut"> - <string>Ctrl+R</string> - </property> <property name="icon"> <iconset resource="stylesheetbrowser.qrc"> <normaloff>:/view-refresh.png</normaloff>:/view-refresh.png</iconset> </property> + <property name="shortcut"> + <string>Ctrl+R</string> + </property> </widget> </item> <item> @@ -52,8 +88,14 @@ </widget> </item> <item> - <widget class="QWebEngineView" name="webEngineView"> - <property name="url"> + <widget class="QWebEngineView" name="webEngineView" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="url" stdset="0"> <url> <string>about:blank</string> </url> @@ -84,6 +126,8 @@ <header location="global">QtWebEngineWidgets/QWebEngineView</header> </customwidget> </customwidgets> - <resources/> + <resources> + <include location="stylesheetbrowser.qrc"/> + </resources> <connections/> </ui> diff --git a/examples/webenginewidgets/videoplayer/main.cpp b/examples/webenginewidgets/videoplayer/main.cpp index f62518274..cad9c7ea9 100644 --- a/examples/webenginewidgets/videoplayer/main.cpp +++ b/examples/webenginewidgets/videoplayer/main.cpp @@ -57,6 +57,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); MainWindow mainWindow; + mainWindow.resize(1024, 768); mainWindow.show(); return app.exec(); diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 80c60e1a8..f03679d17 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -259,7 +259,8 @@ void QWebEngineView::findText(const QString &subString, QWebEnginePage::FindFlag */ QSize QWebEngineView::sizeHint() const { - return QSize(800, 600); + // TODO: Remove this override for Qt 6 + return QWidget::sizeHint(); } QWebEngineSettings *QWebEngineView::settings() const diff --git a/tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp b/tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp index 4848038df..f932d50c3 100644 --- a/tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp +++ b/tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp @@ -112,6 +112,7 @@ void tst_QWebEngineDownloads::initTestCase() m_page = new QWebEnginePage(m_profile); m_view = new QWebEngineView; m_view->setPage(m_page); + m_view->resize(640, 480); m_view->show(); } diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index d62ace045..ffc0b6989 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -3312,6 +3312,7 @@ protected: void tst_QWebEnginePage::evaluateWillCauseRepaint() { WebView view; + view.resize(640, 480); view.show(); QVERIFY(QTest::qWaitForWindowExposed(&view)); @@ -4052,6 +4053,7 @@ void tst_QWebEnginePage::mouseButtonTranslation() <div style=\"height:600px;\" onmousedown=\"saveLastEvent(event)\">\ </div>\ </body></html>")); + view.resize(640, 480); view.show(); QVERIFY(QTest::qWaitForWindowExposed(&view)); QTRY_VERIFY(spy.count() == 1); @@ -4076,6 +4078,7 @@ void tst_QWebEnginePage::mouseMovementProperties() QWebEngineView view; ConsolePage page; view.setPage(&page); + view.resize(640, 480); view.show(); QVERIFY(QTest::qWaitForWindowExposed(&view)); diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index 24e581870..248d906ef 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -153,6 +153,7 @@ private Q_SLOTS: void focusOnNavigation_data(); void focusOnNavigation(); void focusInternalRenderWidgetHostViewQuickItem(); + void doNotBreakLayout(); void changeLocale(); void inputMethodsTextFormat_data(); @@ -345,6 +346,7 @@ void tst_QWebEngineView::crashTests() void tst_QWebEngineView::microFocusCoordinates() { QWebEngineView webView; + webView.resize(640, 480); webView.show(); QVERIFY(QTest::qWaitForWindowExposed(&webView)); @@ -379,6 +381,7 @@ void tst_QWebEngineView::focusInputTypes() bool imeHasHiddenTextCapability = context && context->hasCapability(QPlatformInputContext::HiddenTextCapability); QWebEngineView webView; + webView.resize(640, 480); webView.show(); QVERIFY(QTest::qWaitForWindowExposed(&webView)); @@ -482,6 +485,7 @@ void tst_QWebEngineView::unhandledKeyEventPropagation() { KeyEventRecordingWidget parentWidget; QWebEngineView webView(&parentWidget); + webView.resize(640, 480); parentWidget.show(); QVERIFY(QTest::qWaitForWindowExposed(&webView)); @@ -825,6 +829,7 @@ void tst_QWebEngineView::doNotSendMouseKeyboardEventsWhenDisabled() QFETCH(int, resultEventCount); KeyboardAndMouseEventRecordingWidget parentWidget; + parentWidget.resize(640, 480); QWebEngineView webView(&parentWidget); webView.setEnabled(viewEnabled); parentWidget.setLayout(new QStackedLayout); @@ -1030,6 +1035,31 @@ void tst_QWebEngineView::focusInternalRenderWidgetHostViewQuickItem() QTRY_COMPARE(renderWidgetHostViewQuickItem->hasFocus(), true); } +void tst_QWebEngineView::doNotBreakLayout() +{ + QScopedPointer<QWidget> containerWidget(new QWidget); + + QHBoxLayout *layout = new QHBoxLayout; + layout->addWidget(new QWidget); + layout->addWidget(new QWidget); + layout->addWidget(new QWidget); + layout->addWidget(new QWebEngineView); + + containerWidget->setLayout(layout); + containerWidget->setGeometry(50, 50, 800, 600); + containerWidget->show(); + QVERIFY(QTest::qWaitForWindowExposed(containerWidget.data())); + + QSize previousSize = static_cast<QWidgetItem *>(layout->itemAt(0))->widget()->size(); + for (int i = 1; i < layout->count(); i++) { + QSize actualSize = static_cast<QWidgetItem *>(layout->itemAt(i))->widget()->size(); + // There could be smaller differences on some platforms + QVERIFY(qAbs(previousSize.width() - actualSize.width()) <= 2); + QVERIFY(qAbs(previousSize.height() - actualSize.height()) <= 2); + previousSize = actualSize; + } +} + void tst_QWebEngineView::changeLocale() { QStringList errorLines; @@ -1593,6 +1623,7 @@ void tst_QWebEngineView::softwareInputPanel() { TestInputContext testContext; QWebEngineView view; + view.resize(640, 480); view.show(); QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool))); @@ -1649,6 +1680,7 @@ void tst_QWebEngineView::softwareInputPanel() void tst_QWebEngineView::inputMethods() { QWebEngineView view; + view.resize(640, 480); view.show(); QSignalSpy selectionChangedSpy(&view, SIGNAL(selectionChanged())); @@ -1745,6 +1777,7 @@ void tst_QWebEngineView::inputMethods() void tst_QWebEngineView::textSelectionInInputField() { QWebEngineView view; + view.resize(640, 480); view.show(); QSignalSpy selectionChangedSpy(&view, SIGNAL(selectionChanged())); @@ -1826,6 +1859,7 @@ void tst_QWebEngineView::textSelectionInInputField() void tst_QWebEngineView::textSelectionOutOfInputField() { QWebEngineView view; + view.resize(640, 480); view.show(); QSignalSpy selectionChangedSpy(&view, SIGNAL(selectionChanged())); @@ -1909,6 +1943,7 @@ void tst_QWebEngineView::textSelectionOutOfInputField() void tst_QWebEngineView::hiddenText() { QWebEngineView view; + view.resize(640, 480); view.show(); QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool))); @@ -1934,6 +1969,7 @@ void tst_QWebEngineView::hiddenText() void tst_QWebEngineView::emptyInputMethodEvent() { QWebEngineView view; + view.resize(640, 480); view.show(); QSignalSpy selectionChangedSpy(&view, SIGNAL(selectionChanged())); @@ -1980,6 +2016,7 @@ void tst_QWebEngineView::emptyInputMethodEvent() void tst_QWebEngineView::imeComposition() { QWebEngineView view; + view.resize(640, 480); view.show(); QSignalSpy selectionChangedSpy(&view, SIGNAL(selectionChanged())); @@ -2154,6 +2191,7 @@ void tst_QWebEngineView::imeComposition() void tst_QWebEngineView::newlineInTextarea() { QWebEngineView view; + view.resize(640, 480); view.show(); QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool))); @@ -2253,6 +2291,7 @@ void tst_QWebEngineView::newlineInTextarea() void tst_QWebEngineView::imeJSInputEvents() { QWebEngineView view; + view.resize(640, 480); view.settings()->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, true); view.show(); @@ -2396,6 +2435,7 @@ void tst_QWebEngineView::imeCompositionQueryEvent_data() void tst_QWebEngineView::imeCompositionQueryEvent() { QWebEngineView view; + view.resize(640, 480); view.settings()->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, true); view.show(); @@ -2477,6 +2517,7 @@ void tst_QWebEngineView::globalMouseSelection() QApplication::clipboard()->clear(QClipboard::Selection); QWebEngineView view; + view.resize(640, 480); view.show(); QSignalSpy selectionChangedSpy(&view, SIGNAL(selectionChanged())); @@ -2557,6 +2598,7 @@ void tst_QWebEngineView::contextMenu() } view.setContextMenuPolicy(contextMenuPolicy); + view.resize(640, 480); view.show(); QVERIFY(view.findChildren<QMenu *>().isEmpty()); |