diff options
46 files changed, 446 insertions, 57 deletions
diff --git a/examples/core/permissions/Main.qml b/examples/core/permissions/Main.qml index 691af037be..5d2aeaa16f 100644 --- a/examples/core/permissions/Main.qml +++ b/examples/core/permissions/Main.qml @@ -86,6 +86,7 @@ Window { text: qsTr("Request location permissions") enabled: locationPermission.status !== Qt.Denied Layout.alignment: Qt.AlignHCenter + Layout.fillWidth: false onClicked: locationPermission.request() } diff --git a/examples/quick/layouts/layouts.qml b/examples/quick/layouts/layouts.qml index ded8ccbf95..92fe305559 100644 --- a/examples/quick/layouts/layouts.qml +++ b/examples/quick/layouts/layouts.qml @@ -30,6 +30,7 @@ ApplicationWindow { id: rowBox title: qsTr("Row layout") Layout.fillWidth: true + Layout.fillHeight: false Layout.minimumWidth: rowLayout.Layout.minimumWidth + 30 RowLayout { @@ -41,6 +42,7 @@ ApplicationWindow { } Button { text: qsTr("Button") + Layout.fillWidth: false } } } @@ -49,6 +51,7 @@ ApplicationWindow { id: gridBox title: qsTr("Grid layout") Layout.fillWidth: true + Layout.fillHeight: false Layout.minimumWidth: gridLayout.Layout.minimumWidth + 30 GridLayout { diff --git a/examples/quick/localstorage/Header.qml b/examples/quick/localstorage/Header.qml index 047e49a839..a539452844 100644 --- a/examples/quick/localstorage/Header.qml +++ b/examples/quick/localstorage/Header.qml @@ -99,6 +99,7 @@ Item { font.pixelSize: 22 activeFocusOnPress: true activeFocusOnTab: true + Layout.fillWidth: false ToolTip { x: parent.width + 3 @@ -130,6 +131,7 @@ Item { font.pixelSize: 22 activeFocusOnPress: true activeFocusOnTab: true + Layout.fillWidth: false onFocusChanged: if (focus) oldString = descInput.text onEditingFinished: function() { if (descInput.text.length < 8 && descInput.text !== descInput.oldString && root.enabled) @@ -143,6 +145,7 @@ Item { font.pixelSize: 22 activeFocusOnPress: true activeFocusOnTab: true + Layout.fillWidth: false validator: RegularExpressionValidator { regularExpression: /\d{1,3}/ } diff --git a/examples/quick/localstorage/localstorage.qml b/examples/quick/localstorage/localstorage.qml index 77bf63adf0..3bed3e99df 100644 --- a/examples/quick/localstorage/localstorage.qml +++ b/examples/quick/localstorage/localstorage.qml @@ -37,6 +37,7 @@ Window { RowLayout { Button { text: qsTr("New") + Layout.fillWidth: false onClicked: { input.initrec_new() window.creatingNewEntry = true @@ -47,6 +48,7 @@ Window { id: saveButton enabled: (window.creatingNewEntry || window.editingEntry) && listView.currentIndex !== -1 text: qsTr("Save") + Layout.fillWidth: false onClicked: { let insertedRow = false; if (listView.model.get(listView.currentIndex).id < 1) { @@ -80,6 +82,7 @@ Window { id: editButton text: qsTr("Edit") enabled: !window.creatingNewEntry && !window.editingEntry && listView.currentIndex !== -1 + Layout.fillWidth: false onClicked: { input.editrec(listView.model.get(listView.currentIndex).date, listView.model.get(listView.currentIndex).trip_desc, @@ -93,6 +96,7 @@ Window { id: deleteButton text: qsTr("Delete") enabled: !window.creatingNewEntry && listView.currentIndex !== -1 + Layout.fillWidth: false onClicked: { JS.dbDeleteRow(listView.model.get(listView.currentIndex).id) listView.model.remove(listView.currentIndex, 1) @@ -107,6 +111,7 @@ Window { id: cancelButton text: qsTr("Cancel") enabled: (window.creatingNewEntry || window.editingEntry) && listView.currentIndex !== -1 + Layout.fillWidth: false onClicked: { if (listView.model.get(listView.currentIndex).id === 0) { // This entry had an id of 0, which means it was being created and hadn't @@ -121,6 +126,7 @@ Window { } Button { text: qsTr("Exit") + Layout.fillWidth: false onClicked: Qt.quit() } } diff --git a/examples/quick/responsivelayouts/responsivelayouts.qml b/examples/quick/responsivelayouts/responsivelayouts.qml index 4762c2c923..f9ef99612d 100644 --- a/examples/quick/responsivelayouts/responsivelayouts.qml +++ b/examples/quick/responsivelayouts/responsivelayouts.qml @@ -138,6 +138,7 @@ Window { LayoutItemProxy { Layout.fillHeight: true + Layout.fillWidth: false target: contentItem } } diff --git a/examples/quick/scenegraph/rhitextureitem/main.qml b/examples/quick/scenegraph/rhitextureitem/main.qml index 2c7a4fbe0d..dd664eaa57 100644 --- a/examples/quick/scenegraph/rhitextureitem/main.qml +++ b/examples/quick/scenegraph/rhitextureitem/main.qml @@ -172,6 +172,7 @@ Item { from: 8 to: 2048 value: 128 + Layout.fillWidth: false } } @@ -197,6 +198,7 @@ Item { from: 0 to: 1.0 value: 1.0 + Layout.fillWidth: false } } @@ -234,18 +236,22 @@ Item { id: rdFormatRGBA8 text: qsTr("8-bit RGBA") checked: true + Layout.fillWidth: false } RadioButton { id: rdFormatFP16 text: qsTr("Half-float RGBA") + Layout.fillWidth: false } RadioButton { id: rdFormatFP32 text: qsTr("Float RGBA") + Layout.fillWidth: false } RadioButton { id: rdFormatRGB10A2 text: qsTr("10-bit RGB, 2-bit A") + Layout.fillWidth: false } } } diff --git a/examples/quick/tableview/gameoflife/main.qml b/examples/quick/tableview/gameoflife/main.qml index bedb624223..55c5b193f8 100644 --- a/examples/quick/tableview/gameoflife/main.qml +++ b/examples/quick/tableview/gameoflife/main.qml @@ -74,6 +74,7 @@ ApplicationWindow { text: qsTr("Next") onClicked: gameOfLifeModel.nextStep() Layout.rightMargin: 50 + Layout.fillWidth: false } //! [next] @@ -82,10 +83,12 @@ ApplicationWindow { from: 0 to: 1 value: 0.9 + Layout.fillWidth: false } Button { text: timer.running ? "❙❙" : "▶️" + Layout.fillWidth: false onClicked: timer.running = !timer.running } } diff --git a/examples/quickcontrols/attachedstyleproperties/attachedstyleproperties.qml b/examples/quickcontrols/attachedstyleproperties/attachedstyleproperties.qml index d1674d05e8..95ff4418e8 100644 --- a/examples/quickcontrols/attachedstyleproperties/attachedstyleproperties.qml +++ b/examples/quickcontrols/attachedstyleproperties/attachedstyleproperties.qml @@ -32,6 +32,7 @@ ApplicationWindow { Switch { id: darkModeSwitch text: qsTr("Dark mode") + Layout.fillWidth: false } } } @@ -48,11 +49,13 @@ ApplicationWindow { RowLayout { Button { text: qsTr("Open Popup") + Layout.fillWidth: false onClicked: popup.open() } Button { text: qsTr("Open Window") + Layout.fillWidth: false onClicked: { if (!childWindow.active) childWindow.show() @@ -80,6 +83,7 @@ ApplicationWindow { Button { text: qsTr("Close Popup") Layout.alignment: Qt.AlignHCenter + Layout.fillWidth: false onClicked: popup.close() } } @@ -103,6 +107,7 @@ ApplicationWindow { Button { text: qsTr("Close Window") Layout.alignment: Qt.AlignHCenter + Layout.fillWidth: false onClicked: childWindow.close() } } diff --git a/examples/quickcontrols/chattutorial/chapter3/ConversationPage.qml b/examples/quickcontrols/chattutorial/chapter3/ConversationPage.qml index 8f3a64485c..9a4f1861bd 100644 --- a/examples/quickcontrols/chattutorial/chapter3/ConversationPage.qml +++ b/examples/quickcontrols/chattutorial/chapter3/ConversationPage.qml @@ -77,6 +77,7 @@ Page { Pane { id: pane Layout.fillWidth: true + Layout.fillHeight: false RowLayout { width: parent.width @@ -92,6 +93,7 @@ Page { id: sendButton text: qsTr("Send") enabled: messageField.length > 0 + Layout.fillWidth: false } } } diff --git a/examples/quickcontrols/chattutorial/chapter4/ConversationPage.qml b/examples/quickcontrols/chattutorial/chapter4/ConversationPage.qml index 44c39b40bd..87ed487c66 100644 --- a/examples/quickcontrols/chattutorial/chapter4/ConversationPage.qml +++ b/examples/quickcontrols/chattutorial/chapter4/ConversationPage.qml @@ -99,6 +99,7 @@ Page { Pane { id: pane Layout.fillWidth: true + Layout.fillHeight: false RowLayout { width: parent.width @@ -114,6 +115,7 @@ Page { id: sendButton text: qsTr("Send") enabled: messageField.length > 0 + Layout.fillWidth: false onClicked: { listView.model.sendMessage(root.inConversationWith, messageField.text) messageField.text = "" diff --git a/examples/quickcontrols/chattutorial/chapter5/ConversationPage.qml b/examples/quickcontrols/chattutorial/chapter5/ConversationPage.qml index 75129b43d8..db45deac5b 100644 --- a/examples/quickcontrols/chattutorial/chapter5/ConversationPage.qml +++ b/examples/quickcontrols/chattutorial/chapter5/ConversationPage.qml @@ -98,6 +98,7 @@ Page { Pane { id: pane Layout.fillWidth: true + Layout.fillHeight: false RowLayout { width: parent.width @@ -113,6 +114,7 @@ Page { id: sendButton text: qsTr("Send") enabled: messageField.length > 0 + Layout.fillWidth: false onClicked: { listView.model.sendMessage(root.inConversationWith, messageField.text) messageField.text = "" diff --git a/examples/quickcontrols/filesystemexplorer/qml/Editor.qml b/examples/quickcontrols/filesystemexplorer/qml/Editor.qml index 80f7c04c57..2f995c88c9 100644 --- a/examples/quickcontrols/filesystemexplorer/qml/Editor.qml +++ b/examples/quickcontrols/filesystemexplorer/qml/Editor.qml @@ -36,6 +36,7 @@ Rectangle { Layout.preferredWidth: fontMetrics.averageCharacterWidth * (Math.floor(Math.log10(textArea.lineCount)) + 1) + 10 Layout.fillHeight: true + Layout.fillWidth: false interactive: false contentY: editorFlickable.contentY diff --git a/examples/quickcontrols/filesystemexplorer/qml/Sidebar.qml b/examples/quickcontrols/filesystemexplorer/qml/Sidebar.qml index aac5303942..f739e0f930 100644 --- a/examples/quickcontrols/filesystemexplorer/qml/Sidebar.qml +++ b/examples/quickcontrols/filesystemexplorer/qml/Sidebar.qml @@ -50,6 +50,8 @@ Rectangle { id: tabBarComponent Layout.fillWidth: true + Layout.fillHeight: false + // ButtonGroup ensures that only one button can be checked at a time. ButtonGroup { buttons: tabBarComponent.contentChildren diff --git a/examples/quickcontrols/flatstyle/MainForm.ui.qml b/examples/quickcontrols/flatstyle/MainForm.ui.qml index 389ee893c3..ff05a2dcef 100644 --- a/examples/quickcontrols/flatstyle/MainForm.ui.qml +++ b/examples/quickcontrols/flatstyle/MainForm.ui.qml @@ -94,6 +94,7 @@ Item { id: button text: qsTr("Change Color") Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + Layout.fillWidth: false } } } diff --git a/examples/quickcontrols/imagine/automotive/qml/automotive.qml b/examples/quickcontrols/imagine/automotive/qml/automotive.qml index 2f116f0eca..9ed2f5996d 100644 --- a/examples/quickcontrols/imagine/automotive/qml/automotive.qml +++ b/examples/quickcontrols/imagine/automotive/qml/automotive.qml @@ -277,6 +277,7 @@ ApplicationWindow { Frame { Layout.fillWidth: true + Layout.fillHeight: false ColumnLayout { anchors.fill: parent @@ -290,15 +291,18 @@ ApplicationWindow { RadioButton { text: qsTr("Name") font.pixelSize: fontSizeExtraSmall + Layout.fillWidth: false } RadioButton { text: qsTr("Frequency") font.pixelSize: fontSizeExtraSmall + Layout.fillWidth: false } RadioButton { text: qsTr("Favourites") font.pixelSize: fontSizeExtraSmall checked: true + Layout.fillWidth: false } } } @@ -533,6 +537,7 @@ ApplicationWindow { currentIndex: 1 Layout.fillHeight: true + Layout.fillWidth: false ButtonGroup { buttons: rightTabBarContentLayout.children @@ -557,6 +562,7 @@ ApplicationWindow { Layout.maximumHeight: navigationFeatureButton.height Layout.fillHeight: true + Layout.fillWidth: false } FeatureButton { text: qsTr("Air Con.") @@ -565,6 +571,7 @@ ApplicationWindow { Layout.maximumHeight: navigationFeatureButton.height Layout.fillHeight: true + Layout.fillWidth: false } FeatureButton { text: qsTr("Seats") @@ -572,6 +579,7 @@ ApplicationWindow { Layout.maximumHeight: navigationFeatureButton.height Layout.fillHeight: true + Layout.fillWidth: false } FeatureButton { text: qsTr("Statistics") @@ -579,6 +587,7 @@ ApplicationWindow { Layout.maximumHeight: navigationFeatureButton.height Layout.fillHeight: true + Layout.fillWidth: false } } } diff --git a/examples/quickcontrols/ios/todolist/HomePage.qml b/examples/quickcontrols/ios/todolist/HomePage.qml index 7693aab119..39753e0be7 100644 --- a/examples/quickcontrols/ios/todolist/HomePage.qml +++ b/examples/quickcontrols/ios/todolist/HomePage.qml @@ -141,6 +141,7 @@ Page { enabled: newProjectTextField.length > 0 Layout.alignment: Qt.AlignHCenter + Layout.fillWidth: false onClicked: { let results = Database.newProject(newProjectTextField.text) diff --git a/examples/quickcontrols/ios/todolist/MaxTasksPage.qml b/examples/quickcontrols/ios/todolist/MaxTasksPage.qml index 2f4b649ea0..5b1a854617 100644 --- a/examples/quickcontrols/ios/todolist/MaxTasksPage.qml +++ b/examples/quickcontrols/ios/todolist/MaxTasksPage.qml @@ -29,6 +29,7 @@ Page { Layout.alignment: Qt.AlignHCenter Layout.topMargin: 10 + Layout.fillWidth: false onValueModified: AppSettings.maxTasks = maxTasksSpinbox.value } diff --git a/examples/quickcontrols/ios/todolist/ProjectPage.qml b/examples/quickcontrols/ios/todolist/ProjectPage.qml index 9868a97d28..8319206fe9 100644 --- a/examples/quickcontrols/ios/todolist/ProjectPage.qml +++ b/examples/quickcontrols/ios/todolist/ProjectPage.qml @@ -53,6 +53,7 @@ Page { value: root.completedTasks to: root.totalTasks Layout.leftMargin: 20 + Layout.fillWidth: false } } diff --git a/examples/quickcontrols/ios/todolist/ToggleCompletedTasksPage.qml b/examples/quickcontrols/ios/todolist/ToggleCompletedTasksPage.qml index dbe922aa40..7e42eaf8f3 100644 --- a/examples/quickcontrols/ios/todolist/ToggleCompletedTasksPage.qml +++ b/examples/quickcontrols/ios/todolist/ToggleCompletedTasksPage.qml @@ -27,6 +27,7 @@ Page { Layout.alignment: Qt.AlignHCenter Layout.topMargin: 10 + Layout.fillWidth: false onClicked: AppSettings.showDoneTasks = checked } diff --git a/examples/quickcontrols/texteditor/qml/+touch/texteditor.qml b/examples/quickcontrols/texteditor/qml/+touch/texteditor.qml index f0220f97b3..376a8341eb 100644 --- a/examples/quickcontrols/texteditor/qml/+touch/texteditor.qml +++ b/examples/quickcontrols/texteditor/qml/+touch/texteditor.qml @@ -85,6 +85,7 @@ ApplicationWindow { text: "\uE809" // icon-ok opacity: !textArea.readOnly ? 1 : 0 onClicked: textArea.readOnly = true + Layout.fillWidth: false } Label { @@ -99,6 +100,7 @@ ApplicationWindow { font.family: "fontello" text: "\uF142" // icon-ellipsis-vert onClicked: menu.open() + Layout.fillWidth: false Menu { id: menu diff --git a/tests/manual/fontfeatures/main.qml b/tests/manual/fontfeatures/main.qml index e65568dc79..74de63e4e6 100644 --- a/tests/manual/fontfeatures/main.qml +++ b/tests/manual/fontfeatures/main.qml @@ -43,6 +43,7 @@ ApplicationWindow { } ToolButton { text: "..." + Layout.fillWidth: false onClicked: fontDialog.visible = true } } @@ -51,6 +52,7 @@ ApplicationWindow { text: "This text is fine" font.family: "Calibri" font.pixelSize: 20 + Layout.fillWidth: false } TextField { id: smcpText @@ -60,6 +62,7 @@ ApplicationWindow { "pixelSize": sampleText.font.pixelSize, "features": { "smcp": 1 } } + Layout.fillWidth: false } TextField { id: noLigaturesOrKerning @@ -67,12 +70,15 @@ ApplicationWindow { font.family: sampleText.font.family font.pixelSize: sampleText.font.pixelSize font.features: { "liga": 0, "dlig": 0, "clig": 0, "hlig": 0, "kern": 0 } + Layout.fillWidth: false } ListView { id: listView height: window.height / 2 width: window.width + Layout.fillWidth: false + Layout.fillHeight: false model: [ "aalt", "abvf", "abvm", diff --git a/tests/manual/painterpathquickshape/ControlPanel.qml b/tests/manual/painterpathquickshape/ControlPanel.qml index 3fbe33968f..9678ccaa5c 100644 --- a/tests/manual/painterpathquickshape/ControlPanel.qml +++ b/tests/manual/painterpathquickshape/ControlPanel.qml @@ -84,18 +84,25 @@ Item { } } } - CheckBox { id: enableDebug } + CheckBox { + id: enableDebug + fillWidth: false + } Label { text: "Debug" color: "white" } - CheckBox { id: enableWireframe } + CheckBox { + id: enableWireframe + Layout.fillWidth: false + } Label { text: "Wireframe" color: "white" } ComboBox { id: painterComparison + Layout.fillWidth: false model: [ "No QPainter comparison", "Overlaid QPainter comparison", @@ -119,6 +126,7 @@ Item { from: 0.0 to: 1.0 value: 1.0 + Layout.fillWidth: false } Label { text: "Alpha" @@ -128,6 +136,7 @@ Item { text: "Pick SVG sub-shape" id: pickSubShape palette.windowText: "white" + Layout.fillWidth: false } SpinBox { id: subShapeSelector @@ -135,17 +144,20 @@ Item { value: 0 to: 999 editable: true + Layout.fillWidth: false } CheckBox { id: pickSubShapeGreaterThan visible: pickSubShape.checked text: "show greater than" palette.windowText: "white" + Layout.fillWidth: false } CheckBox { id: setBackground text: "Solid background" palette.windowText: "white" + Layout.fillWidth: false } RowLayout { visible: setBackground.checked @@ -183,6 +195,7 @@ Item { TextField { id: scaleEdit text: scaleSlider.value.toFixed(4) + Layout.fillWidth: false onEditingFinished: { let val = +text if (val > 0) @@ -217,6 +230,7 @@ Item { } ComboBox { id: gradientType + Layout.fillWidth: false model: [ "NoGradient", "LinearGradient", "RadialGradient", "ConicalGradient" ] } Label { @@ -227,6 +241,7 @@ Item { id: fillRule textRole: "text" valueRole: "style" + Layout.fillWidth: false model: ListModel { ListElement { text: "WindingFill" @@ -255,6 +270,7 @@ Item { id: enableOutline text: "Enable outline" palette.windowText: "white" + Layout.fillWidth: false } RowLayout { opacity: enableOutline.checked ? 1 : 0 @@ -279,6 +295,7 @@ Item { id: outlineStyle textRole: "text" valueRole: "style" + Layout.fillWidth: false model: ListModel { ListElement { text: "Solid line" @@ -294,6 +311,7 @@ Item { id: joinStyle textRole: "text" valueRole: "style" + Layout.fillWidth: false model: ListModel { ListElement { text: "Miter join" @@ -313,6 +331,7 @@ Item { id: capStyle textRole: "text" valueRole: "style" + Layout.fillWidth: false model: ListModel { ListElement { text: "Square cap" @@ -335,6 +354,7 @@ Item { TextField { id: outlineWidthEdit text: (cosmeticPen.checked ? outlineWidthSlider.value: outlineWidthSlider.value ** 2).toFixed(2) + Layout.fillWidth: false onEditingFinished: { let val = +text if (val > 0) { @@ -356,6 +376,7 @@ Item { id: cosmeticPen text: "Cosmetic pen" palette.windowText: "white" + Layout.fillWidth: false } Label { text: "Outline alpha (" + Math.round(outlineAlphaSlider.value*100)/100 + "):" diff --git a/tests/manual/quickcontrols/fonts/main.qml b/tests/manual/quickcontrols/fonts/main.qml index 3f1b5a91ed..b4a497f569 100644 --- a/tests/manual/quickcontrols/fonts/main.qml +++ b/tests/manual/quickcontrols/fonts/main.qml @@ -27,6 +27,7 @@ ApplicationWindow { to: 48 value: 12 stepSize: 1 + Layout.fillWidth: false } Label { text: pointSizeSlider.value + " pt " + font.family @@ -34,6 +35,7 @@ ApplicationWindow { Button { text: "Font…" palette.buttonText: systemPalette.buttonText + Layout.fillWidth: false onClicked: fontDialog.open() FontDialog { id: fontDialog } Component.onCompleted: fontDialog.selectedFont = window.font @@ -42,6 +44,7 @@ ApplicationWindow { Button { text: "Text…" palette.buttonText: textColorDialog.selectedColor + Layout.fillWidth: false onClicked: textColorDialog.open() ColorDialog { id: textColorDialog } Component.onCompleted: textColorDialog.selectedColor = systemPalette.text @@ -50,6 +53,7 @@ ApplicationWindow { } Button { text: "Buttons…" + Layout.fillWidth: false onClicked: buttonTextColorDialog.open() ColorDialog { id: buttonTextColorDialog } Component.onCompleted: buttonTextColorDialog.selectedColor = systemPalette.buttonText @@ -72,20 +76,44 @@ ApplicationWindow { text: "Label with **Bold** *Italics* _Underline_ ~~Strikethrough~~ `Mono`" textFormat: Label.MarkdownText } - Button { text: "Button" } + Button { + text: "Button" + Layout.fillWidth: false + } GroupBox { title: "GroupBox" + Layout.fillWidth: false + Layout.fillHeight: false ColumnLayout { RadioButton { text: "RadioButton" } CheckBox { text: "CheckBox" } } } - Switch { text: "Switch" } - TabButton { text: "TabButton" } - TextField { placeholderText: "TextField" } - TextArea { placeholderText: "TextArea" } - ToolButton { text: "ToolButton" } - Tumbler { model: 3 } + Switch { + text: "Switch" + Layout.fillWidth: false + } + TabButton { + text: "TabButton" + Layout.fillWidth: false + } + TextField { + placeholderText: "TextField" + Layout.fillWidth: false + } + TextArea { + placeholderText: "TextArea" + Layout.fillWidth: false + Layout.fillHeight: false + } + ToolButton { + text: "ToolButton" + } + Tumbler { + model: 3 + Layout.fillWidth: false + Layout.fillHeight: false + } } ScrollBar.vertical: ScrollBar { } diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox-tristate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox-tristate.qml index 55d9bc28e3..547e339883 100644 --- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox-tristate.qml +++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox-tristate.qml @@ -23,18 +23,21 @@ Window { checkState: english.checked && norwegian.checked ? Qt.Checked : (english.checked || norwegian.checked) ? Qt.PartiallyChecked : Qt.Unchecked tristate: true + Layout.fillWidth: false } CheckBox { id: english text: qsTr("English") checked: true leftPadding: indicator.width + Layout.fillWidth: false } CheckBox { id: norwegian text: qsTr("Norwegian") checked: true leftPadding: indicator.width + Layout.fillWidth: false } } } diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox.qml index 867bb6142e..73026be792 100644 --- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox.qml +++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox.qml @@ -21,15 +21,18 @@ Window { CheckBox { checked: true text: qsTr("First") + Layout.fillWidth: false } CheckBox { id: control2 text: qsTr("Second") + Layout.fillWidth: false } CheckBox { id: control3 checked: true text: qsTr("Third") + Layout.fillWidth: false } } } diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiobutton.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiobutton.qml index 7e4c391673..c0ba781a5b 100644 --- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiobutton.qml +++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiobutton.qml @@ -23,14 +23,17 @@ Window { id: control1 text: qsTr("First") checked: true + Layout.fillWidth: false } RadioButton { id: control2 text: qsTr("Second") + Layout.fillWidth: false } RadioButton { id: control3 text: qsTr("Third") + Layout.fillWidth: false } } } diff --git a/tests/manual/quickcontrols/imagine/musicplayer/musicplayer.qml b/tests/manual/quickcontrols/imagine/musicplayer/musicplayer.qml index 7d321534a7..8e9847b3a3 100644 --- a/tests/manual/quickcontrols/imagine/musicplayer/musicplayer.qml +++ b/tests/manual/quickcontrols/imagine/musicplayer/musicplayer.qml @@ -29,30 +29,14 @@ ApplicationWindow { anchors.fill: parent spacing: 0 - ToolButton { - icon.name: "grid" - } - ToolButton { - icon.name: "settings" - } - ToolButton { - icon.name: "filter" - } - ToolButton { - icon.name: "message" - } - ToolButton { - icon.name: "music" - } - ToolButton { - icon.name: "cloud" - } - ToolButton { - icon.name: "bluetooth" - } - ToolButton { - icon.name: "cart" - } + ToolButton { icon.name: "grid" } + ToolButton { icon.name: "settings" } + ToolButton { icon.name: "filter" } + ToolButton { icon.name: "message" } + ToolButton { icon.name: "music" } + ToolButton { icon.name: "cloud" } + ToolButton { icon.name: "bluetooth" } + ToolButton { icon.name: "cart" } Item { Layout.fillWidth: true @@ -132,11 +116,13 @@ ApplicationWindow { Button { icon.name: "folder" + Layout.fillWidth: false } Button { icon.name: "save" enabled: false + Layout.fillWidth: false } } @@ -283,36 +269,43 @@ ApplicationWindow { icon.name: "favorite" icon.width: 32 icon.height: 32 + Layout.fillWidth: false } RoundButton { icon.name: "stop" icon.width: 32 icon.height: 32 + Layout.fillWidth: false } RoundButton { icon.name: "previous" icon.width: 32 icon.height: 32 + Layout.fillWidth: false } RoundButton { icon.name: "pause" icon.width: 32 icon.height: 32 + Layout.fillWidth: false } RoundButton { icon.name: "next" icon.width: 32 icon.height: 32 + Layout.fillWidth: false } RoundButton { icon.name: "repeat" icon.width: 32 icon.height: 32 + Layout.fillWidth: false } RoundButton { icon.name: "shuffle" icon.width: 32 icon.height: 32 + Layout.fillWidth: false } } @@ -355,14 +348,17 @@ ApplicationWindow { Button { text: "Files" checked: true + Layout.fillWidth: false } Button { text: "Playlists" checkable: true + Layout.fillWidth: false } Button { text: "Favourites" checkable: true + Layout.fillWidth: false } } @@ -372,6 +368,7 @@ ApplicationWindow { } Button { icon.name: "folder" + Layout.fillWidth: false } } diff --git a/tests/manual/quickcontrols/material/material.qml b/tests/manual/quickcontrols/material/material.qml index edbc1564b7..706c1679f6 100644 --- a/tests/manual/quickcontrols/material/material.qml +++ b/tests/manual/quickcontrols/material/material.qml @@ -53,6 +53,7 @@ ApplicationWindow { ToolButton { action: openDrawerAction + Layout.fillWidth: false } Label { @@ -73,11 +74,13 @@ ApplicationWindow { id: darkThemeSwitch text: "Dark" checked: settings.theme === Material.Dark + Layout.fillWidth: false } Switch { id: denseSwitch text: "Dense" + Layout.fillWidth: false checked: settings.variant === "Dense" ToolTip.text: "Requires restart" diff --git a/tests/manual/quickcontrols/material/pages/ButtonPage.qml b/tests/manual/quickcontrols/material/pages/ButtonPage.qml index 22ee0894a7..fa16ad7b4f 100644 --- a/tests/manual/quickcontrols/material/pages/ButtonPage.qml +++ b/tests/manual/quickcontrols/material/pages/ButtonPage.qml @@ -16,16 +16,19 @@ Page { id: textCheckBox text: "Text" checked: true + Layout.fillWidth: false } CheckBox { id: iconCheckBox text: "Icon" + Layout.fillWidth: false } CheckBox { id: disabledCheckBox text: "Disabled" + Layout.fillWidth: false } Item { diff --git a/tests/manual/quickcontrols/material/pages/DelayButtonPage.qml b/tests/manual/quickcontrols/material/pages/DelayButtonPage.qml index ee9c12f446..1236c51b58 100644 --- a/tests/manual/quickcontrols/material/pages/DelayButtonPage.qml +++ b/tests/manual/quickcontrols/material/pages/DelayButtonPage.qml @@ -15,6 +15,7 @@ Page { CheckBox { id: disabledCheckBox text: "Disabled" + Layout.fillWidth: false } Item { diff --git a/tests/manual/quickcontrols/material/pages/RoundButtonPage.qml b/tests/manual/quickcontrols/material/pages/RoundButtonPage.qml index 1fbcbf2e45..459d28c00c 100644 --- a/tests/manual/quickcontrols/material/pages/RoundButtonPage.qml +++ b/tests/manual/quickcontrols/material/pages/RoundButtonPage.qml @@ -15,11 +15,13 @@ Page { CheckBox { id: iconCheckBox text: "Icon" + Layout.fillWidth: false } CheckBox { id: disabledCheckBox text: "Disabled" + Layout.fillWidth: false } Item { @@ -46,6 +48,7 @@ Page { text: "Flat" Layout.leftMargin: elevationLayout.contentLeftMargin + Layout.fillWidth: false } } @@ -65,6 +68,7 @@ Page { Material.elevation: modelData Layout.leftMargin: elevationLayout.contentLeftMargin + Layout.fillWidth: false } } diff --git a/tests/manual/quickcontrols/material/pages/SwitchPage.qml b/tests/manual/quickcontrols/material/pages/SwitchPage.qml index 5335fa6290..13a9fa254c 100644 --- a/tests/manual/quickcontrols/material/pages/SwitchPage.qml +++ b/tests/manual/quickcontrols/material/pages/SwitchPage.qml @@ -17,22 +17,26 @@ Page { Switch { text: "Switch" + Layout.fillWidth: false } Switch { text: "Checked Switch" checked: true + Layout.fillWidth: false } Switch { text: "Disabled Switch" enabled: false + Layout.fillWidth: false } Switch { text: "Checked disabled Switch" checked: true enabled: false + Layout.fillWidth: false } Item { @@ -46,18 +50,21 @@ Page { Switch { text: "Switch" icon.source: Constants.iconSource + Layout.fillWidth: false } Switch { text: "Checked Switch" icon.source: Constants.iconSource checked: true + Layout.fillWidth: false } Switch { text: "Disabled Switch" icon.source: Constants.iconSource enabled: false + Layout.fillWidth: false } Switch { @@ -65,6 +72,7 @@ Page { icon.source: Constants.iconSource checked: true enabled: false + Layout.fillWidth: false } Item { diff --git a/tests/manual/quickcontrols/styles/styles.qml b/tests/manual/quickcontrols/styles/styles.qml index c766bdd5f0..76db2af6b9 100644 --- a/tests/manual/quickcontrols/styles/styles.qml +++ b/tests/manual/quickcontrols/styles/styles.qml @@ -109,6 +109,8 @@ ApplicationWindow { topPadding: 30 contentWidth: fontColumnLayout.implicitWidth + fontColumnLayout.anchors.leftMargin background.visible: false + Layout.fillWidth: false + Layout.fillHeight: false ColumnLayout { id: fontColumnLayout @@ -118,15 +120,18 @@ ApplicationWindow { RadioButton { leftPadding: 0 text: "Small" + Layout.fillWidth: false } RadioButton { leftPadding: 0 text: "Medium" checked: true + Layout.fillWidth: false } RadioButton { leftPadding: 0 text: "Large" + Layout.fillWidth: false } } } @@ -138,6 +143,7 @@ ApplicationWindow { background.visible: false Layout.fillWidth: true + Layout.fillHeight: false GridLayout { id: audioGridLayout @@ -175,6 +181,7 @@ ApplicationWindow { Button { text: "Save" Layout.alignment: Qt.AlignRight + Layout.fillWidth: false } Item { Layout.fillHeight: true } diff --git a/tests/manual/quickcontrols/testbench/ColorEditor.qml b/tests/manual/quickcontrols/testbench/ColorEditor.qml index dd5d7f3aaa..9c358a4adf 100644 --- a/tests/manual/quickcontrols/testbench/ColorEditor.qml +++ b/tests/manual/quickcontrols/testbench/ColorEditor.qml @@ -29,5 +29,6 @@ RowLayout { } Layout.preferredWidth: 200 + Layout.fillWidth: false } } diff --git a/tests/manual/quickcontrols/testbench/SettingsDialog.qml b/tests/manual/quickcontrols/testbench/SettingsDialog.qml index f879e5074f..8f3bf769e3 100644 --- a/tests/manual/quickcontrols/testbench/SettingsDialog.qml +++ b/tests/manual/quickcontrols/testbench/SettingsDialog.qml @@ -120,6 +120,7 @@ Ui.Dialog { GroupBox { title: qsTr("General") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -161,6 +162,7 @@ Ui.Dialog { title: qsTr("Imagine Style") visible: usingImagineStyle Layout.fillWidth: true + Layout.fillHeight: false Layout.columnSpan: 2 GridLayout { @@ -173,6 +175,7 @@ Ui.Dialog { enabled: usingImagineStyle Layout.columnSpan: 2 + Layout.fillWidth: false } Label { @@ -217,6 +220,7 @@ Ui.Dialog { enabled: usingImagineStyle && customImagineStyleCheckBox.checked Layout.columnSpan: 2 + Layout.fillWidth: false ToolTip { text: "If set, custom Imagine style assets will be modified to be compliant whenever they have changed on disk" @@ -231,6 +235,7 @@ Ui.Dialog { GroupBox { title: qsTr("Palette") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -239,6 +244,7 @@ Ui.Dialog { CheckBox { id: useCustomPaletteCheckBox text: qsTr("Use Custom Palette") + Layout.fillWidth: false } ColorEditor { @@ -376,6 +382,7 @@ Ui.Dialog { Layout.columnSpan: 2 Layout.alignment: Qt.AlignRight + Layout.fillWidth: false } } } diff --git a/tests/manual/quickdialogs/dialogs/ColorDialogPage.qml b/tests/manual/quickdialogs/dialogs/ColorDialogPage.qml index 1f0f015e78..310bd5b080 100644 --- a/tests/manual/quickdialogs/dialogs/ColorDialogPage.qml +++ b/tests/manual/quickdialogs/dialogs/ColorDialogPage.qml @@ -20,6 +20,7 @@ ColumnLayout { title: qsTr("Dialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -41,17 +42,20 @@ ColumnLayout { RadioButton { text: qsTr("Qt.NonModal") + Layout.fillWidth: false readonly property int modality: Qt.NonModal } RadioButton { text: qsTr("Qt.WindowModal") checked: true + Layout.fillWidth: false readonly property int modality: Qt.WindowModal } RadioButton { text: qsTr("Qt.ApplicationModal") + Layout.fillWidth: false readonly property int modality: Qt.ApplicationModal } @@ -65,6 +69,7 @@ ColumnLayout { text: colorDialog.result === 1 ? qsTr("Accepted") : qsTr("Rejected") readOnly: true enabled: false + Layout.fillWidth: false } Label { @@ -73,6 +78,7 @@ ColumnLayout { TextField { id: titleTextField text: qsTr("A Color Dialog") + Layout.fillWidth: false } } } @@ -81,6 +87,7 @@ ColumnLayout { title: qsTr("ColorDialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -122,12 +129,14 @@ ColumnLayout { CheckBox { id: showAlphaChannel text: qsTr("ShowAlphaChannel") + Layout.fillWidth: false readonly property int colorOption: checked ? ColorDialog.ShowAlphaChannel : 0 } CheckBox { id: noButtons text: qsTr("NoButtons") + Layout.fillWidth: false readonly property int colorOption: checked ? ColorDialog.NoButtons : 0 } @@ -135,6 +144,7 @@ ColumnLayout { CheckBox { id: noEyeDropperButton text: qsTr("NoEyeDropperButton") + Layout.fillWidth: false readonly property int colorOption: checked ? ColorDialog.NoEyeDropperButton : 0 } diff --git a/tests/manual/quickdialogs/dialogs/FileDialogPage.qml b/tests/manual/quickdialogs/dialogs/FileDialogPage.qml index a7fb46b232..094cfe3746 100644 --- a/tests/manual/quickdialogs/dialogs/FileDialogPage.qml +++ b/tests/manual/quickdialogs/dialogs/FileDialogPage.qml @@ -22,6 +22,7 @@ ColumnLayout { title: qsTr("Dialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -43,17 +44,20 @@ ColumnLayout { RadioButton { text: qsTr("Qt.NonModal") + Layout.fillWidth: false readonly property int modality: Qt.NonModal } RadioButton { text: qsTr("Qt.WindowModal") checked: true + Layout.fillWidth: false readonly property int modality: Qt.WindowModal } RadioButton { text: qsTr("Qt.ApplicationModal") + Layout.fillWidth: false readonly property int modality: Qt.ApplicationModal } @@ -67,6 +71,7 @@ ColumnLayout { text: fileDialog.result === 1 ? qsTr("Accepted") : qsTr("Rejected") readOnly: true enabled: false + Layout.fillWidth: false } Label { @@ -75,6 +80,7 @@ ColumnLayout { TextField { id: titleTextField text: qsTr("Choose a file") + Layout.fillWidth: false } } } @@ -83,6 +89,7 @@ ColumnLayout { title: qsTr("FileDialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -97,6 +104,7 @@ ColumnLayout { TextField { id: acceptLabelTextField text: qsTr("OK") + Layout.fillWidth: false } Label { @@ -145,24 +153,28 @@ ColumnLayout { CheckBox { id: dontResolveSymlinksCheckBox text: qsTr("DontResolveSymlinks") + Layout.fillWidth: false readonly property int fileOption: checked ? FileDialog.DontResolveSymlinks : 0 } CheckBox { id: dontConfirmOverwriteCheckBox text: qsTr("DontConfirmOverwrite") + Layout.fillWidth: false readonly property int fileOption: checked ? FileDialog.DontConfirmOverwrite : 0 } CheckBox { id: readOnlyCheckBox text: qsTr("ReadOnly") + Layout.fillWidth: false readonly property int fileOption: checked ? FileDialog.ReadOnly : 0 } CheckBox { id: hideNameFilterDetailsCheckBox text: qsTr("HideNameFilterDetails") + Layout.fillWidth: false readonly property int fileOption: checked ? FileDialog.HideNameFilterDetails : 0 } @@ -182,17 +194,20 @@ ColumnLayout { RadioButton { text: qsTr("OpenFile") + Layout.fillWidth: false readonly property int fileMode: FileDialog.OpenFile } RadioButton { text: qsTr("OpenFiles") checked: true + Layout.fillWidth: false readonly property int fileMode: FileDialog.OpenFiles } RadioButton { text: qsTr("SaveFile") + Layout.fillWidth: false readonly property int fileMode: FileDialog.SaveFile } @@ -218,6 +233,7 @@ ColumnLayout { TextField { id: rejectLabelTextField text: qsTr("Cancel") + Layout.fillWidth: false } Label { diff --git a/tests/manual/quickdialogs/dialogs/FolderDialogPage.qml b/tests/manual/quickdialogs/dialogs/FolderDialogPage.qml index 765b886cff..c146674d25 100644 --- a/tests/manual/quickdialogs/dialogs/FolderDialogPage.qml +++ b/tests/manual/quickdialogs/dialogs/FolderDialogPage.qml @@ -22,6 +22,7 @@ ColumnLayout { title: qsTr("Dialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -43,17 +44,20 @@ ColumnLayout { RadioButton { text: qsTr("Qt.NonModal") + Layout.fillWidth: false readonly property int modality: Qt.NonModal } RadioButton { text: qsTr("Qt.WindowModal") checked: true + Layout.fillWidth: false readonly property int modality: Qt.WindowModal } RadioButton { text: qsTr("Qt.ApplicationModal") + Layout.fillWidth: false readonly property int modality: Qt.ApplicationModal } @@ -67,6 +71,7 @@ ColumnLayout { text: folderDialog.result === 1 ? qsTr("Accepted") : qsTr("Rejected") readOnly: true enabled: false + Layout.fillWidth: false } Label { @@ -75,6 +80,7 @@ ColumnLayout { TextField { id: titleTextField text: qsTr("Choose a folder") + Layout.fillWidth: false } } } @@ -83,6 +89,7 @@ ColumnLayout { title: qsTr("FolderDialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -97,6 +104,7 @@ ColumnLayout { TextField { id: acceptLabelTextField text: qsTr("OK") + Layout.fillWidth: false } Label { @@ -105,6 +113,7 @@ ColumnLayout { TextField { id: rejectLabelTextField text: qsTr("Cancel") + Layout.fillWidth: false } Label { @@ -130,12 +139,14 @@ ColumnLayout { CheckBox { id: dontResolveSymlinksCheckBox text: qsTr("DontResolveSymlinks") + Layout.fillWidth: false readonly property int folderOption: checked ? FolderDialog.DontResolveSymlinks : 0 } CheckBox { id: readOnlyCheckBox text: qsTr("ReadOnly") + Layout.fillWidth: false readonly property int folderOption: checked ? FolderDialog.ReadOnly : 0 } diff --git a/tests/manual/quickdialogs/dialogs/FontDialogPage.qml b/tests/manual/quickdialogs/dialogs/FontDialogPage.qml index 285d5f764d..f49a2cf15b 100644 --- a/tests/manual/quickdialogs/dialogs/FontDialogPage.qml +++ b/tests/manual/quickdialogs/dialogs/FontDialogPage.qml @@ -22,6 +22,7 @@ ColumnLayout { title: qsTr("Dialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -43,17 +44,20 @@ ColumnLayout { RadioButton { text: qsTr("Qt.NonModal") + Layout.fillWidth: false readonly property int modality: Qt.NonModal } RadioButton { text: qsTr("Qt.WindowModal") checked: true + Layout.fillWidth: false readonly property int modality: Qt.WindowModal } RadioButton { text: qsTr("Qt.ApplicationModal") + Layout.fillWidth: false readonly property int modality: Qt.ApplicationModal } @@ -67,6 +71,7 @@ ColumnLayout { text: fontDialog.result === 1 ? qsTr("Accepted") : qsTr("Rejected") readOnly: true enabled: false + Layout.fillWidth: false } Label { @@ -75,6 +80,7 @@ ColumnLayout { TextField { id: titleTextField text: qsTr("Pick a font") + Layout.fillWidth: false } } } @@ -83,6 +89,7 @@ ColumnLayout { title: qsTr("FontDialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -127,30 +134,35 @@ ColumnLayout { CheckBox { id: noButtons text: qsTr("NoButtons") + Layout.fillWidth: false readonly property int fontOption: checked ? FontDialog.NoButtons : 0 } CheckBox { id: scalableFonts text: qsTr("ScalableFonts") + Layout.fillWidth: false readonly property int fontOption: checked ? FontDialog.ScalableFonts : 0 } CheckBox { id: nonScalableFonts text: qsTr("NonScalableFonts") + Layout.fillWidth: false readonly property int fontOption: checked ? FontDialog.NonScalableFonts : 0 } CheckBox { id: monospacedFonts text: qsTr("MonospacedFonts") + Layout.fillWidth: false readonly property int fontOption: checked ? FontDialog.MonospacedFonts : 0 } CheckBox { id: proportionalFonts text: qsTr("ProportionalFonts") + Layout.fillWidth: false readonly property int fontOption: checked ? FontDialog.ProportionalFonts : 0 } diff --git a/tests/manual/quickdialogs/dialogs/MessageDialogPage.qml b/tests/manual/quickdialogs/dialogs/MessageDialogPage.qml index 1fa2deef18..9097ff7ba6 100644 --- a/tests/manual/quickdialogs/dialogs/MessageDialogPage.qml +++ b/tests/manual/quickdialogs/dialogs/MessageDialogPage.qml @@ -20,6 +20,7 @@ ColumnLayout { title: qsTr("Dialog properties") Layout.fillWidth: true + Layout.fillHeight: false GridLayout { columns: 2 @@ -41,17 +42,20 @@ ColumnLayout { RadioButton { text: qsTr("Qt.NonModal") + Layout.fillWidth: false readonly property int modality: Qt.NonModal } RadioButton { text: qsTr("Qt.WindowModal") checked: true + Layout.fillWidth: false readonly property int modality: Qt.WindowModal } RadioButton { text: qsTr("Qt.ApplicationModal") + Layout.fillWidth: false readonly property int modality: Qt.ApplicationModal } @@ -65,6 +69,7 @@ ColumnLayout { text: messageBox.result === 1 ? qsTr("Accepted") : qsTr("Rejected") readOnly: true enabled: false + Layout.fillWidth: false } Label { @@ -73,6 +78,7 @@ ColumnLayout { TextField { id: titleTextField text: qsTr("Hello World") + Layout.fillWidth: false } } } @@ -81,6 +87,7 @@ ColumnLayout { title: qsTr("MessageBox properties") Layout.fillWidth: true + Layout.fillHeight: false ColumnLayout { RowLayout { @@ -90,6 +97,7 @@ ColumnLayout { TextField { id: textProperty text: qsTr("default text") + Layout.fillWidth: false } } RowLayout { @@ -99,6 +107,7 @@ ColumnLayout { TextField { id: informativeTextProperty text: qsTr("default informative text") + Layout.fillWidth: false } } @@ -116,6 +125,8 @@ ColumnLayout { border.width: 1 } Layout.maximumWidth: ApplicationWindow.window.width * 0.5 + Layout.fillWidth: false + Layout.fillHeight: false wrapMode: TextEdit.WordWrap text: qsTr("This text will be displayed in the 'detailed text' textArea, which the user must press a button to see.\n" + "If this is an empty string, the button will not be visible.") @@ -125,102 +136,119 @@ ColumnLayout { CheckBox { id: okCheckbox text: qsTr("Ok") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Ok : MessageDialog.NoButton } CheckBox { id: saveCheckbox text: qsTr("Save") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Save : MessageDialog.NoButton } CheckBox { id: saveAllCheckbox text: qsTr("Save All") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.SaveAll : MessageDialog.NoButton } CheckBox { id: openCheckbox text: qsTr("Open") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Open : MessageDialog.NoButton } CheckBox { id: yesCheckbox text: qsTr("Yes") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Yes : MessageDialog.NoButton } CheckBox { id: yesToAllCheckbox text: qsTr("Yes to all") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.YesToAll : MessageDialog.NoButton } CheckBox { id: noCheckbox text: qsTr("No") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.No : MessageDialog.NoButton } CheckBox { id: noToAllCheckbox text: qsTr("No to all") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.NoToAll : MessageDialog.NoButton } CheckBox { id: abortCheckbox text: qsTr("Abort") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Abort : MessageDialog.NoButton } CheckBox { id: retryCheckbox text: qsTr("Retry") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Retry : MessageDialog.NoButton } CheckBox { id: ignoreCheckbox text: qsTr("Ignore") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Ignore : MessageDialog.NoButton } CheckBox { id: closeCheckbox text: qsTr("Close") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Close : MessageDialog.NoButton } CheckBox { id: cancelCheckbox text: qsTr("Cancel") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Cancel : MessageDialog.NoButton } CheckBox { id: discardCheckbox text: qsTr("Discard") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Discard : MessageDialog.NoButton } CheckBox { id: helpCheckbox text: qsTr("Help") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Help : MessageDialog.NoButton } CheckBox { id: applyCheckbox text: qsTr("Apply") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Apply : MessageDialog.NoButton } CheckBox { id: resetCheckbox text: qsTr("Reset") + Layout.fillWidth: false readonly property int value: checked ? MessageDialog.Reset : MessageDialog.NoButton } diff --git a/tests/manual/quickdialogs/dialogs/dialogs.qml b/tests/manual/quickdialogs/dialogs/dialogs.qml index cd0c2e7e7f..5312a9806c 100644 --- a/tests/manual/quickdialogs/dialogs/dialogs.qml +++ b/tests/manual/quickdialogs/dialogs/dialogs.qml @@ -80,6 +80,7 @@ ApplicationWindow { id: useNativeDialogsCheckBox text: qsTr("Use Native Dialogs (requires restart)") checked: settings.useNativeDialogs + Layout.fillWidth: false } Item { @@ -88,6 +89,7 @@ ApplicationWindow { Button { text: qsTr("Open") + Layout.fillWidth: false onClicked: stackLayout.children[stackLayout.currentIndex].dialog.open() } diff --git a/tests/manual/shortcuts/shortcuts.qml b/tests/manual/shortcuts/shortcuts.qml index 7687700303..b82aded870 100644 --- a/tests/manual/shortcuts/shortcuts.qml +++ b/tests/manual/shortcuts/shortcuts.qml @@ -77,6 +77,7 @@ ApplicationWindow { ComboBox { id: combobox enabled: checkbox.checked + Layout.fillWidth: false model: ["WindowShortcut", "ApplicationShortcut"] } diff --git a/tests/manual/tableview/abstracttablemodel/main.qml b/tests/manual/tableview/abstracttablemodel/main.qml index 9f4b8cfe7c..46882677dd 100644 --- a/tests/manual/tableview/abstracttablemodel/main.qml +++ b/tests/manual/tableview/abstracttablemodel/main.qml @@ -33,11 +33,14 @@ ApplicationWindow { Layout.rightMargin: menu.menuMargin Layout.leftMargin: menu.menuMargin Layout.topMargin: menu.menuMargin + Layout.fillWidth: false + Layout.fillHeight: false ColumnLayout { CheckBox { text: "Use Syncview" checkable: true checked: true + Layout.fillWidth: false onCheckedChanged: { if (checked) { leftHeader.syncView = tableView @@ -53,6 +56,7 @@ ApplicationWindow { id: flickingMode checkable: true checked: false + Layout.fillWidth: false text: "Interactive" } @@ -60,6 +64,7 @@ ApplicationWindow { id: indexNavigation checkable: true checked: true + Layout.fillWidth: false text: "Enable navigation" } @@ -67,6 +72,7 @@ ApplicationWindow { id: resizableRowsEnabled checkable: true checked: false + Layout.fillWidth: false text: "Resizable rows" } @@ -74,6 +80,7 @@ ApplicationWindow { id: resizableColumnsEnabled checkable: true checked: false + Layout.fillWidth: false text: "Resizable columns" } @@ -81,6 +88,7 @@ ApplicationWindow { id: enableAnimation checkable: true checked: true + Layout.fillWidth: false text: "Enable animation" } @@ -88,6 +96,7 @@ ApplicationWindow { id: drawText checkable: true checked: true + Layout.fillWidth: false text: "Draw text" } @@ -95,6 +104,7 @@ ApplicationWindow { id: useRandomColor checkable: true checked: false + Layout.fillWidth: false text: "Use colors" } @@ -103,6 +113,7 @@ ApplicationWindow { checkable: true checked: false text: "Use large cells" + Layout.fillWidth: false onCheckedChanged: Qt.callLater(tableView.forceLayout) } @@ -110,6 +121,7 @@ ApplicationWindow { id: useSubRect checkable: true checked: false + Layout.fillWidth: false text: "Use subRect" } @@ -117,6 +129,7 @@ ApplicationWindow { id: useOffset checkable: true checked: false + Layout.fillWidth: false text: "Use offset" } @@ -124,6 +137,7 @@ ApplicationWindow { id: highlightCurrentRow checkable: true checked: false + Layout.fillWidth: false text: "Highlight row/col" } @@ -132,6 +146,7 @@ ApplicationWindow { checkable: true checked: tableView.interactive text: "Show selection handles" + Layout.fillWidth: false } ComboBox { @@ -143,6 +158,7 @@ ApplicationWindow { "SelectRows", "SelectColumns", ] + Layout.fillWidth: false } ComboBox { @@ -156,6 +172,7 @@ ApplicationWindow { { text: "ContiguousSelection", value: TableView.ContiguousSelection }, { text: "ExtendedSelection", value: TableView.ExtendedSelection } ] + Layout.fillWidth: false } ComboBox { @@ -166,6 +183,7 @@ ApplicationWindow { "Drag", "PressAndHold", ] + Layout.fillWidth: false } ComboBox { id: editCombo @@ -178,6 +196,7 @@ ApplicationWindow { "EditKeyPressed", "AnyKeyPressed", ] + Layout.fillWidth: false } } } @@ -186,6 +205,8 @@ ApplicationWindow { Layout.minimumWidth: menu.availableWidth - (menu.menuMargin * 2) Layout.rightMargin: menu.menuMargin Layout.leftMargin: menu.menuMargin + Layout.fillWidth: false + Layout.fillHeight: false GridLayout { columns: 2 Label { text: "Model size:" } @@ -195,6 +216,7 @@ ApplicationWindow { to: 1000 value: 200 editable: true + Layout.fillWidth: false } Label { text: "Spacing:" } SpinBox { @@ -203,6 +225,7 @@ ApplicationWindow { to: 100 value: 1 editable: true + Layout.fillWidth: false } Label { text: "Margins:" } SpinBox { @@ -211,6 +234,7 @@ ApplicationWindow { to: 100 value: 0 editable: true + Layout.fillWidth: false } } } @@ -219,10 +243,13 @@ ApplicationWindow { Layout.minimumWidth: menu.availableWidth - (menu.menuMargin * 2) Layout.rightMargin: menu.menuMargin Layout.leftMargin: menu.menuMargin + Layout.fillWidth: false + Layout.fillHeight: false RowLayout { id: positionRow Button { text: "<<" + Layout.fillWidth: false onClicked: { tableView.positionViewAtRow(0, Qt.AlignTop, -tableView.topMargin) tableView.positionViewAtColumn(0, Qt.AlignLeft, -tableView.leftMargin) @@ -231,6 +258,7 @@ ApplicationWindow { Button { text: ">>" + Layout.fillWidth: false onClicked: { tableView.positionViewAtRow(tableView.rows - 1, Qt.AlignBottom, tableView.bottomMargin) tableView.positionViewAtColumn(tableView.columns - 1, Qt.AlignRight, tableView.rightMargin) @@ -243,34 +271,41 @@ ApplicationWindow { Layout.minimumWidth: menu.availableWidth - (menu.menuMargin * 2) Layout.rightMargin: menu.menuMargin Layout.leftMargin: menu.menuMargin + Layout.fillWidth: false + Layout.fillHeight: false ColumnLayout { Button { text: "Add row" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: tableView.model.insertRows(currentIndex.row, 1) } Button { text: "Remove row" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: tableView.model.removeRows(currentIndex.row, 1) } Button { text: "Add column" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: tableView.model.insertColumns(currentIndex.column, 1) } Button { text: "Remove column" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: tableView.model.removeColumns(currentIndex.column, 1) } Button { text: "Hide column" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: { hiddenColumn = currentIndex.column tableView.forceLayout() @@ -283,10 +318,13 @@ ApplicationWindow { Layout.minimumWidth: menu.availableWidth - (menu.menuMargin * 2) Layout.rightMargin: menu.menuMargin Layout.leftMargin: menu.menuMargin + Layout.fillWidth: false + Layout.fillHeight: false ColumnLayout { Button { text: "Current to top-left" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: { let cell = Qt.point(currentIndex.column, currentIndex.row) tableView.positionViewAtCell(cell, Qt.AlignTop | Qt.AlignLeft, positionOffset, positionSubRect) @@ -296,6 +334,7 @@ ApplicationWindow { Button { text: "Current to center" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: { let cell = Qt.point(currentIndex.column, currentIndex.row) tableView.positionViewAtCell(cell, Qt.AlignCenter, positionOffset, positionSubRect) @@ -305,6 +344,7 @@ ApplicationWindow { Button { text: "Current to bottom-right" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: { let cell = Qt.point(currentIndex.column, currentIndex.row) tableView.positionViewAtCell(cell, Qt.AlignBottom | Qt.AlignRight, positionOffset, positionSubRect) @@ -314,6 +354,7 @@ ApplicationWindow { Button { text: "Current to Visible" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: { let cell = Qt.point(currentIndex.column, currentIndex.row) tableView.positionViewAtCell(cell, TableView.Visible, positionOffset, positionSubRect) @@ -323,6 +364,7 @@ ApplicationWindow { Button { text: "Current to Contain" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: { let cell = Qt.point(currentIndex.column, currentIndex.row) tableView.positionViewAtCell(cell, TableView.Contain, positionOffset, positionSubRect) @@ -335,10 +377,13 @@ ApplicationWindow { Layout.minimumWidth: menu.availableWidth - (menu.menuMargin * 2) Layout.rightMargin: menu.menuMargin Layout.leftMargin: menu.menuMargin + Layout.fillWidth: false + Layout.fillHeight: false ColumnLayout { Button { text: "Open editor" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: { tableView.edit(currentIndex, true) } @@ -346,12 +391,14 @@ ApplicationWindow { Button { text: "Close editor" enabled: currentIndex.valid + Layout.fillWidth: false onClicked: { tableView.closeEditor() } } Button { text: "Set current index" + Layout.fillWidth: false onClicked: { let index = tableView.modelIndex(1, 1); tableView.selectionModel.setCurrentIndex(index, ItemSelectionModel.NoUpdate) @@ -365,9 +412,12 @@ ApplicationWindow { Layout.rightMargin: menu.menuMargin Layout.leftMargin: menu.menuMargin Layout.bottomMargin: menu.menuMargin + Layout.fillWidth: false + Layout.fillHeight: false ColumnLayout { Button { text: "Fast-flick table" + Layout.fillWidth: false onClicked: { tableView.contentX += tableView.width * 1.2 } @@ -375,6 +425,7 @@ ApplicationWindow { Button { text: "Fast-flick headers" + Layout.fillWidth: false onClicked: { topHeader.contentX += tableView.width * 1.2 leftHeader.contentY += tableView.height * 1.2 @@ -383,6 +434,7 @@ ApplicationWindow { Button { text: "ForceLayout()" + Layout.fillWidth: false onClicked: tableView.forceLayout() } } diff --git a/tests/manual/text/textInputPropertiesAndSignals.qml b/tests/manual/text/textInputPropertiesAndSignals.qml index c06b532693..5519114d39 100644 --- a/tests/manual/text/textInputPropertiesAndSignals.qml +++ b/tests/manual/text/textInputPropertiesAndSignals.qml @@ -17,6 +17,7 @@ Item { id: enabledCB text: "enabled" checked: true + Layout.fillWidth: false } // ==================================================== @@ -31,6 +32,7 @@ Item { id: textInputMouseSelCB text: "mouse select" onCheckedChanged: textInput.selectByMouse = checked + Layout.fillWidth: false } Rectangle { @@ -110,6 +112,7 @@ Item { id: textFieldMouseSelCB text: "mouse select" onCheckedChanged: textField.selectByMouse = checked + Layout.fillWidth: false } TextField { @@ -190,6 +193,7 @@ Item { text: "setText" Layout.column: 2 Layout.row: 14 + Layout.fillWidth: false onClicked: { Qt.inputMethod.reset() textInput.text = copyFrom.text @@ -211,14 +215,17 @@ Item { CheckBox { id: textEditReadOnly text: "read-only" + Layout.fillWidth: false } CheckBox { id: textEditMouseSelCB text: "mouse select" + Layout.fillWidth: false onCheckedChanged: textEdit.selectByMouse = checked } CheckBox { id: textEditPressDelayCB + Layout.fillWidth: false text: "press delay: " + flick.pressDelay } } @@ -350,10 +357,12 @@ Item { CheckBox { id: textAreaReadOnly text: "read-only" + Layout.fillWidth: false } CheckBox { id: textAreaMouseSelCB text: "mouse select" + Layout.fillWidth: false onCheckedChanged: textArea.selectByMouse = checked } } diff --git a/tests/manual/textrendering/main.qml b/tests/manual/textrendering/main.qml index 5d3a6489dd..8cc7c04344 100644 --- a/tests/manual/textrendering/main.qml +++ b/tests/manual/textrendering/main.qml @@ -59,6 +59,7 @@ Window { TextField { id: dummyText text: "Foobar" + Layout.fillWidth: false } Label { @@ -70,6 +71,7 @@ Window { from: 0.5 to: 10 value: 1 + Layout.fillWidth: false } Label { @@ -86,16 +88,19 @@ Window { ComboBox { id: styleCombo + Layout.fillWidth: false model: [ "Normal", "Outline", "Raised", "Sunken" ] } ComboBox { id: renderTypeCombo + Layout.fillWidth: false model: [ "QtRendering", "NativeRendering", "CurveRendering", "Qt Quick Shapes" ] } ComboBox { id: shapesRendererCombo + Layout.fillWidth: false model: [ "GeometryRenderer", "CurveRenderer" ] visible: renderTypeCombo.currentIndex > 2 } diff --git a/tests/testapplications/listview/sticky.qml b/tests/testapplications/listview/sticky.qml index d103498c61..1034bdf764 100644 --- a/tests/testapplications/listview/sticky.qml +++ b/tests/testapplications/listview/sticky.qml @@ -44,43 +44,138 @@ ApplicationWindow { anchors.left: parent.left anchors.right: parent.right - ComboBox { id: oriItem; currentIndex: 1; model: ["Horizontal", "Vertical"] } - ComboBox { id: ldItem; model: ["LeftToRight", "RightToLeft"] } - ComboBox { id: vldItem; model: ["TopToBottom", "BottomToTop"] } + ComboBox { + id: oriItem + currentIndex: 1 + model: ["Horizontal", "Vertical"] + Layout.fillWidth: false + } + ComboBox { + id: ldItem + model: ["LeftToRight", "RightToLeft"] + Layout.fillWidth: false + } + ComboBox { + id: vldItem + model: ["TopToBottom", "BottomToTop"] + Layout.fillWidth: false + } - CheckBox { id: clipItem; text: "Clip"; checked: true } - CheckBox { id: opacityItem; text: "Opaque"; checked: true } - CheckBox { id: filterItem; text: "Filter" } + CheckBox { + id: clipItem + text: "Clip" + checked: true + Layout.fillWidth: false + } + CheckBox { + id: opacityItem + text: "Opaque" + checked: true + Layout.fillWidth: false + } + CheckBox { + id: filterItem + text: "Filter" + Layout.fillWidth: false + } - CheckBox { id: hItem; text: "Header:" } - CheckBox { id: fItem; text: "Footer:" } - Item { width: 1; height: 1 } + CheckBox { + id: hItem + text: "Header:" + Layout.fillWidth: false + } + CheckBox { + id: fItem + text: "Footer:" + Layout.fillWidth: false + } + Item { + width: 1 + height: 1 + } - ComboBox { id: shItem; model: shModel; textRole: "name"; enabled: hItem.checked } - ComboBox { id: sfItem; model: sfModel; textRole: "name"; enabled: fItem.checked } - Item { width: 1; height: 1 } + ComboBox { + id: shItem + model: shModel + textRole: "name" + enabled: hItem.checked + Layout.fillWidth: false + } + ComboBox { + id: sfItem + model: sfModel + textRole: "name" + enabled: fItem.checked + Layout.fillWidth: false + } + Item { + width: 1 + height: 1 + } - CheckBox { id: scsItem; text: "Sticky current section" } - CheckBox { id: snsItem; text: "Sticky next section" } - CheckBox { id: isItem; text: "Inline sections" } + CheckBox { + id: scsItem + text: "Sticky current section" + Layout.fillWidth: false + } + CheckBox { + id: snsItem + text: "Sticky next section" + Layout.fillWidth: false + } + CheckBox { + id: isItem + text: "Inline sections" + Layout.fillWidth: false + } - Button { text: "Beginning"; onClicked: listview.positionViewAtBeginning() } - Button { text: "Middle"; onClicked: listview.positionViewAtIndex(50, ListView.Center) } - Button { text: "End"; onClicked: listview.positionViewAtEnd() } + Button { + text: "Beginning" + Layout.fillWidth: false + onClicked: listview.positionViewAtBeginning() + } + Button { + text: "Middle" + Layout.fillWidth: false + onClicked: listview.positionViewAtIndex(50, ListView.Center) + } + Button { + text: "End" + Layout.fillWidth: false + onClicked: listview.positionViewAtEnd() + } } ListModel { id: shModel - ListElement { name: "Inline"; value: ListView.InlineHeader } - ListElement { name: "Overlay"; value: ListView.OverlayHeader } - ListElement { name: "PullBack"; value: ListView.PullBackHeader } + ListElement { + name: "Inline" + value: ListView.InlineHeader + } + ListElement { + name: "Overlay" + value: ListView.OverlayHeader + } + ListElement { + name: "PullBack" + value: ListView.PullBackHeader + } } ListModel { id: sfModel - ListElement { name: "Inline"; value: ListView.InlineFooter } - ListElement { name: "Overlay"; value: ListView.OverlayFooter } - ListElement { name: "PullBack"; value: ListView.PullBackFooter } + ListElement { + name: "Inline" + value: ListView.InlineFooter + } + ListElement { + name: "Overlay" + value: ListView.OverlayFooter + } + ListElement { + name: "PullBack" + value: ListView.PullBackFooter + } } footer: RowLayout { |