aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Doc: link to Control::contentItem in GroupBox detailed descriptionJ-P Nurmi2016-10-281-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I0f0a93a3ebf0a884e81f9c856490d564b30a90c8 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: fix review findings for DrawerJ-P Nurmi2016-10-281-8/+10
| | | | | | | | | | | | | | | | | | Change-Id: Ibdf3f1dee5664979cdf77ba7485e3d71110fc860 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Material: fix blurry ComboBox drop indicatorsJ-P Nurmi2016-10-285-0/+5
| | | | | | | | | | | | | | | Change-Id: I2c3f101182f8b985180695f6cf3c6baabe9969ed Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Scrollers: give control over layouting if parent != flickableJ-P Nurmi2016-10-284-6/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows utilizing the convenient attached properties of ScrollBar and ScrollIndicator, but positioning the scrollers outside of a clipping Flickable. Change-Id: I46fe79110658f4797469d042c56f51548eef6c70 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * QQuickPopup: fix binding loops with size-dependent positioningJ-P Nurmi2016-10-274-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dependencies between popup's size and position easily lead to recursion into reposition(). Blocking recursive reposition() calls messes up the positioning, so schedule polish events instead. Task-number: QTBUG-56755 Change-Id: I72afd14573e5cd57f8162df04e193d4c42fd7236 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Gallery: make the drawer usable with keyboardJ-P Nurmi2016-10-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give it focus, and remove the check for the current index. It's a leftover from the days when Gallery used to replace the current page instead of doing a push. It looked silly to replace a page with the same page. This can no longer happen, because the drawer is not even accessible when navigated to a control page. And when navigating the drawer with keyboard, it is exactly the current item that must be triggered when you hit the spacebar. :) Change-Id: I00b48fbe4dd61b06041cb0c3370dfa9c12505dcf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Default: move opacity assignments to individual delegatesMitch Curtis2016-10-264-2/+4
| | | | | | | | | | | | | | | | | | | | | This way, users have control over the opacity of child items. Change-Id: Ie7c0b08eb0b22d11319f8c2f1807e6a3a68790ea Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Gallery: add Escape shortcutJ-P Nurmi2016-10-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not work very well, yet. The purpose is to demonstrate the lack of co-operation between of QML Shortcuts vs. QQC2 Popups. For example, the back navigation shortcut activates in the background when the modal settings dialog is open. The consequent commits are going to fix these issues step by step. Task-number: QTBUG-56562 Change-Id: Iceafc175f4da8054b65d664a3e0faf0087d0dec5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Improve testbenchMitch Curtis2016-10-261-2/+138
| | | | | | | | | | | | | | | | | | | | | | | | - Add delegate types - Make Dials smaller Change-Id: If95115b13a1aba61921d9924a0d37e4a263b798b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * testbench: rename main.qml to testbench.qmlMitch Curtis2016-10-263-2/+2
| | | | | | | | | | | | | | | | | | | | | This is one less main.qml to search through. Change-Id: I2d0a8a56a779a6d6acac579d44c641dea318fb3d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Default: make disable controls easier to seeMitch Curtis2016-10-268-9/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-56698 Change-Id: I8e82ee2f2f9c38755e49b6f1b46e9f83a1363463 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Replace QStringLiteral with QLatin1String in the proxy themesJ-P Nurmi2016-10-252-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us, in theory, to test multiple styles in the same process by calling qmlClearTypeRegistrations() between each style test round. When QML types are cleared, QML plugins are unloaded, and the current style plugin's proxy platform theme is destroyed. It leads to a nasty crash if there are fonts stored in the Qt font database that have their family names stored in the read-only data of an unloaded plugin. Change-Id: I32a70077ac4502e16a753fb68f7efeef35d239b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Popup: add spacing support for Dialogv5.8.0-beta1J-P Nurmi2016-10-2610-6/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps to get the dialog layout right (a separate follow-up commit), because we don't need to mess with the paddings of the header, content, and footer, based on their existence and visibility, but we can also adjust the spacing which gets automatically added between the building blocks when they exist and are visible. Change-Id: Ie8b587eeb9d0fb4a8f42baf957879d40bbd3385c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: fallback styleJ-P Nurmi2016-10-263-3/+25
| | | | | | | | | | | | | | | Change-Id: I03996d592de4b7db29b671fa73ab44036a80fa2f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Page: support spacingJ-P Nurmi2016-10-269-13/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spacing support into QQuickPageLayout. Having spacing and padding separately gives more fine-grained control over the layout. Spacing is inserted between the header, content, and footer, but only when the respective building blocks are visible. Change-Id: Ia26a4c33c2756a603ca6d53aefac3a66414b36d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: QT_QUICK_CONTROLS_HOVER_ENABLEDJ-P Nurmi2016-10-262-0/+8
| | | | | | | | | | | | | | | Change-Id: I91b578e6e7956feadb0a9f874fa0c1f4d97f02bf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Add QQuickDialog::titleJ-P Nurmi2016-10-269-12/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dialog is incomplete without built-in support for title. All dialogs in the examples, screenshots, webinars, and blog posts have had a custom title. The Material and Universal designs both have specs for dialog titles. This commit adds support for dialog titles with appropriate looks (padding & font) out of the box. Task-number: QTBUG-56711 Change-Id: I248150313f1ce629a7105fdbe1c70c8fcd69e1cc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | QQuickDialog: simplify the button box handlingJ-P Nurmi2016-10-267-155/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just fill in the footer with a button box by default from the styles. This makes the next step easier, to provide also a default title bar in the header. Task-number: QTBUG-56711 Change-Id: I621a61f29f9ba2fe4b7e907d81da5988133a98c8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | tst_sanity: remove bogus blacklistingJ-P Nurmi2016-10-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Default style ComboBox does not use attached style properties. A harmless but useless warning about a passing blacklisted test: BPASS : tst_Sanity::attachedObjects(controls/ComboBox.qml) Change-Id: I865cee1b9850e031a4e966c2eeb16f0eb4bd280e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Material: share the CursorDelegateJ-P Nurmi2016-10-2810-82/+77
| | | | | | | | | | | | | | | | | | | | | | | | Duplicate code in TextField, TextArea, and SpinBox. The next one is editable ComboBox. Change-Id: Ibbd054d2f945f4964ee0007f9e9dc8a9450902e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Rename QQuickStackAttached to QQuickStackViewAttachedJ-P Nurmi2016-10-275-37/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QQC1 the attached property was called "Stack", purely because we couldn't have both QML and C++ types with the same name. Now the attached properties are provided by StackView itself, so this is the correct name. Change-Id: I0f98d73735cff14c444a9e843b7cb56dc8a45cd8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Move QQuickStackTransition into its own filesJ-P Nurmi2016-10-276-134/+241
| | | | | | | | | | | | | | | Change-Id: I87fdef1c2cc5bb2b04c38b54cca316ace8814f2c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Move QQuickStackElement into its own filesJ-P Nurmi2016-10-276-292/+403
| | | | | | | | | | | | | | | Change-Id: I4fce147f125d4641e1eb3a6534f57d68000dbfc7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickPopup: move the implementation of reposition() to the positionerJ-P Nurmi2016-10-264-143/+152
| | | | | | | | | | | | | | | | | | | | | | | | In the future, the exact type of positioner might vary depending on whether the popup is an item or a window. Change-Id: Id17d1976c7bca72cecb3e9567355264526527286 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Move QQuickPopupItem out of qquickpopup.*J-P Nurmi2016-10-2610-227/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll start slowly refactoring all QQuickPopupItem-specific things out of QQuickPopup. In the future the presentation/backend of a popup could be, under certain circumstances, a native menu popup window, for example. Change-Id: I8508da14ab52c65221afc3a9b7f07c371f0416d2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickPopupPositioner: use QQuickItem::isAncestorOf()J-P Nurmi2016-10-262-18/+1
| | | | | | | | | | | | | | | | | | | | | It was introduced in Qt 5.7, but wasn't taken into use yet... Change-Id: Ib18f7e09a2de7bcd8fa51fd272cd555dc83103c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Move QQuickPopupPositioner out of qquickpopup.*J-P Nurmi2016-10-265-128/+236
| | | | | | | | | | | | | | | | | | | | | qquickpopup.cpp has grown massive. Change-Id: Ibbc83331b642d854d4f7dc2aebe8b3fc46ec7bee Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-10-2561-213/+1374
|\| | | | | | | | | | | Change-Id: If48d66d89172db94ee1839063396156a3a947601
| * | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-2530-157/+830
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/src/qtquickcontrols2-material.qdoc src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc src/imports/controls/material/ComboBox.qml Change-Id: I2a57070f96691cb6bbdaae460fbc60a85be435de
| | * Doc: fix typo in QQuickStyle briefMitch Curtis2016-10-251-1/+1
| | | | | | | | | | | | | | | Change-Id: I629871ac8a077fda900f69d788d612bc3688728f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Doc: remove a redundant QQuickStyle exampleJ-P Nurmi2016-10-251-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The "Styling Qt Quick Controls 2" -page is already overloaded with content. Give a minimal one-liner example and link to QQuickStyle for more details, which contains the same snippet that was removed. Change-Id: I77e196aeb8d407fcf05a264232dd83c2e28f97b7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: configuration fileJ-P Nurmi2016-10-258-43/+178
| | | | | | | | | | | | | | | Change-Id: I3de16850673488a8c67afc6b45a79d5bb86f9013 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: supported environment variablesJ-P Nurmi2016-10-257-49/+138
| | | | | | | | | | | | | | | Change-Id: I2ad1767c1066a07a86e0f5889b350aa4500d685e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Fix tst_swipedelegateJ-P Nurmi2016-10-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | These tests did not pass on my Chromebook Pixel 2. The value of Qt.styleHints.startDragDistance is 19. Change-Id: I8843803608fc4c8ca2f2c42790d648eb17c141fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: add snippets and screenshots for the Universal attached propertiesJ-P Nurmi2016-10-249-26/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ideas and descriptions shamelessly stolen from f26f855, which did the same for the Material style. Change-Id: Ibab47d1370c56de4104dc2bf549870335c639257 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: minor tweaks to the Material style pageJ-P Nurmi2016-10-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the value used in the foreground example, and mention the default accent value right after the brief description, before the example snippet, to make it more visible. The same order is used for all other properties. Change-Id: I10613b6ed2417eb886602d40e90cc74e2dbaf484 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Material: sync ComboBox with ButtonJ-P Nurmi2016-10-241-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ComboBox is modeled after Material design's drop-down Button, but it was never updated to have the same external padding that was added to the Material style Button. Both should have the same visual size to make them look sensible when laid out next to each other. Change-Id: I350f4acb2ea29ba292dbfaea874c348ae57750a2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Material: add snippets and screenshots for attached propertiesMitch Curtis2016-10-2012-25/+279
| | | | | | | | | | | | | | | | | | Change-Id: I4b388f374452c6894fe47c4feb5779fea7776708 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Page: provide implicit sizeJ-P Nurmi2016-10-257-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the control was designed to be used as full-screen page, it can be sometimes useful to have non-fullscreen pages. In order to make Page behave well in layouts, it must provide a suitable implicit size. [ChangeLog][Controls][Page] Page has been made to calculate its implicit size based on the implicit size of the header, content, and footer plus paddings, and the implicit size of the background item. Task-number: QTBUG-56709 Change-Id: I0f40897df6e54d7bde01a464e24f0398b12bc865 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Let specifying the fallback style for custom stylesJ-P Nurmi2016-10-2512-31/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, you can call QQuickStyle::setStyle(":/mycontrols") and QQuickStyle::setFallbackStyle("Material") to select a custom style so that the missing files will fallback to the Material style. Notice that the Material and Universal styles do not contain all files. For example, the non-visual Control.qml, Container.qml are not duplicated. For these, we must fallback to the Default style that is guaranteed to contain them all. [ChangeLog][Controls] Added support for specifying the fallback style for custom styles via :/qtquickcontrols2.conf, QT_QUICK_CONTROLS_FALLBACK_STYLE or QQuickStyle::setFallbackStyle(). Change-Id: I00be1c8c6aaca875ef851c90d018e9b5e2f501b7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: fix SwipeDelegate detailed descriptionJ-P Nurmi2016-10-252-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest 5.7->5.8 merge messed up the detailed description of SwipeDelegate. In 5.7, the snippet was moved from the bottom to the top, but after the merge both were there. Also, the qdoc marker ('1' vs. 'file') did no longer match what was in the snippet file: warning: Command '\snippet (//! [file])' failed at end of file 'qtquickcontrols2-swipedelegate.qml' Change-Id: I77411b737fe0b95e6096a89bd3199bacc2d1c2ae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Universal: fix the size of a footer-less dialogJ-P Nurmi2016-10-242-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Gallery example's About dialog is broken in the Universal style. The dialog doesn't have any bottom padding. Dialog cannot have bottom padding hard-coded to 0. It was assuming that there would be a DialogButtonBox that provides top padding. Set a suitable padding in the dialog instead, so that the dialog content gets padded without a footer. Due to this, we must tweak the top and bottom paddings of DialogButtonBox so that the total spacing between the dialog content and the buttons becomes 24 as it is in the specs. Change-Id: I77e2c3f66c5166391f9be595121f23bc95debde8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: promote also the Text Editor example on the landing pageJ-P Nurmi2016-10-241-0/+1
| | | | | | | | | | | | | | | | | | | | | This example is so nice that it deserves to be promoted... :) Change-Id: I82212803aea4239ad39b52ecd8d1b494bdc87c33 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Dialog: fix implicit size calculationJ-P Nurmi2016-10-244-9/+88
| | | | | | | | | | | | | | | | | | | | | Header and footer visibility must be taken into account. Change-Id: Id9bab1d66c126247df77effb153fefa3a78a1d79 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Use relative paths for imagesThomas Hartmann2016-10-226-8/+8
| | | | | | | | | | | | | | | | | | | | | This is easier to handle for tooling. Change-Id: Ib6b20f06426324bc5d1bd4b66f72d9b0e9a0da87 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Material: rewrite the ripple animationJ-P Nurmi2016-10-202-168/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use animated nodes instead of using the private animator API. Task-number: QTBUG-55652 Task-number: QTBUG-56601 Change-Id: I69d9e6afbc2cb0af6a537553fc39f9871cdd8e97 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add internal QQuickAnimatedNode helperJ-P Nurmi2016-10-209-190/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This handles the timers, signals, updates etc. so that the animated node implementations for busy indicators and indeterminate progress bars become a bit simpler. The implementation is based on qtdeclarative/examples/quick/scenegraph/threadedanimation. Task-number: QTBUG-56601 Change-Id: Ibd82060aa103e6447ee16814c3e0d6ff2c14d608 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-10-1988-214/+1071
|\| | | | | | | | | | | Change-Id: I3da1888c76e3082225ef7e3b0c83fbbf2aaed4cd
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-1936-106/+807
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml src/imports/controls/material/qquickmaterialstyle.cpp Change-Id: I00b533e28407f87a31588e92109a468a5bfb4cc8
| | * Material: introduce an active and disabled icon colorsKonstantin Ritt2016-10-172-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://material.google.com/style/icons.html#icons-system-icons > The standard opacity for an active icon on a light background is 54% (#000000). An inactive icon, which is lower in the visual hierarchy, should have an opacity of 26% (#000000). > The standard opacity for an active icon on a dark background is 100% (#FFFFFF). An inactive icon, which is lower in the visual hierarchy, should have an opacity of 30% (#FFFFFF). Change-Id: I5916855cd0a4005ee55ac781207ac9cf4d078a34 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 18:55:51 +0000