aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QQuickAbstractButton: fix the order of nextCheckState() vs. clicked()J-P Nurmi2016-04-121-4/+4
| | | | | | Task-number: QTBUG-52448 Change-Id: I4ee2c16f3dccc61e07268f9e8ced530a06d2adf3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7J-P Nurmi2016-04-117-7/+7
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-117-7/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/ScrollBar.qml src/imports/controls/material/ScrollBar.qml src/imports/controls/universal/ScrollBar.qml src/templates/qquickscrollbar.cpp tests/auto/controls/data/tst_scrollbar.qml Change-Id: I646882e0563f72df682bac49f96875a08b1b0de9
| | * Doc: fix ButtonGroup::buttons typeJ-P Nurmi2016-04-111-1/+1
| | | | | | | | | | | | | | | Change-Id: Id78ef819c56d4639c33e7b4823c2c2600486befa Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * Fix ScrollBars with paddingsJoni Poikelin2016-04-014-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Padding was not taken into account when calculating the new position, which caused there to be small offset between the mouse press and the resulting handle position by the amount of padding used. Task-number: QTBUG-52233 Change-Id: Ibd8c4375b030a27a6124aefc4bc9af570d14d3a9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * ComboBox: fix usage in an asynchronous LoaderJ-P Nurmi2016-03-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following comment in QQmlDelegateModel::object() helped to find a solution ie. using createdItem() instead of initItem(): If asynchronous is true or the component is being loaded asynchronously due to an ancestor being loaded asynchronously, item() may return 0. In this case createdItem() will be emitted when the item is available. [...] Change-Id: If3bf8e60834534ca07c8db8f502f4f11969057e8 Task-number: QTBUG-51972 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-224-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I40e902a2ddff05684ff90b178728c562c2cd8cd1 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Add RadioDelegateMitch Curtis2016-04-1131-82/+884
|/ / | | | | | | | | | | | | | | | | | | | | RadioDelegate is an item delegate that is used in lists, and can be checked and unchecked. It derives from QQuickItemDelegate and hence has background press effects. The order of the indicator and text is reversed (compared to RadioButton) to reflect what is most commonly seen on mobile. Change-Id: I143ee9a30cd8ce1d624354f4cb981c41dfddc2d2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add CheckDelegateMitch Curtis2016-04-1131-135/+1034
| | | | | | | | | | | | | | | | | | | | | | | | CheckDelegate is an item delegate that is used in lists, and can be checked and unchecked. It derives from QQuickItemDelegate and hence has background press effects. The order of the indicator and text is reversed (compared to CheckBox) to reflect what is most commonly seen on mobile. Change-Id: I6fdac226fe87247052389b2e49f6cf20d7be44fb Task-number: QTBUG-52208 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Correct Switch position & visualPosition documentationMitch Curtis2016-04-111-2/+2
| | | | | | | | | | | | | | | | The position is defined as a percentage of the indicator's size, not the control's. Change-Id: I5f758aa432413c2d93e394f19a1b1109e356a31d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Use Control.activeKeyFocus instead of Item.activeFocusJ-P Nurmi2016-04-1117-35/+35
| | | | | | | | | | | | | | | | | | | | This makes the controls visualize focus only when interacting with keys, so this basically allows us to set for example Qt.StrongFocus policy by default on buttons and friends. Change-Id: I6c81c58b7acfd2bc592bdd12d804e7e48ee65e95 Task-number: QTBUG-51796 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Universal: fix vertical RangeSliderJ-P Nurmi2016-04-111-1/+1
| | | | | | | | | | Change-Id: I7b4b34e77c2bee4890871615d31af2f52afb39ac Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Use the pluginBasePath() to get the right base path for the configurationAndy Shaw2016-04-111-2/+5
| | | | | | | | | | | | | | | | | | Using pluginBasePath() ensures that it finds the qml files in the expected place so it needs to use this to work correctly when statically built. Change-Id: I685a98efc284a7c7d2b6a182f269a09e381a3472 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Take style name into account when creating static plugin base pathMitch Curtis2016-04-111-2/+1
| | | | | | | | | | | | | | | | | | Non-default plugins aren't located under qrc:/qt-project.org/imports/Qt/labs/controls, but rather a sub-directory of it. Change-Id: I9b6e21da29dd50a4aeb7b080a0f7a1d45b744be9 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | Add Control::activeKeyFocusJ-P Nurmi2016-04-113-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a convenience property that combines Item::activeFocus and Control::focusReason. This allows us to solve QTBUG-51796 in an elegant way - we can simply set Qt::StrongFocus policy on most of the interactive controls, such as buttons. The only thing we need to make sure is to use activeKeyFocus instead of activeFocus in the styles. This ensures that key focus is only visualized when actually interacting with keys - not when interacting via touch or mouse. This is a generalized version of the solution that was already used in the Universal style ApplicationWindow. Change-Id: Ifbf78e3e412f3791c8f7c369bb2de53af9ac6b0f Task-number: QTBUG-51796 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add internal QQuickStylePluginJ-P Nurmi2016-04-115-25/+196
| | | | | | | | | | | | | | | | | | This is a common base class for QtQuickMaterialStylePlugin and QtQuickUniversalStylePlugin that takes care of the proxy theme installation and manages its life time by using a scoped pointer. Change-Id: I2cbe38287565d284b18fab4265456a41a2dbd8d4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Material style: Fix color of disabled Label and PageIndicatorKonstantin Ritt2016-04-102-2/+2
| | | | | | | | | | Change-Id: Iec1762d4abed06ee6713288af9007dbebd7bfa6a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Material style: Fix vertical Slider appearanceKonstantin Ritt2016-04-101-4/+4
| | | | | | | | | | Change-Id: Ic1f3ad7f931af87bf1e0fb2938ce8d61351238b4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | QQuickPopup: Deduplicate the code a bitKonstantin Ritt2016-04-101-8/+2
| | | | | | | | | | Change-Id: Ie6fea8d57886ba2c6ed3b3016cd6402f86395f34 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Simplify the style plugins code a bitKonstantin Ritt2016-04-102-26/+12
| | | | | | | | | | | | | | | | QQuickProxyTheme's destructor restores platform_theme, so keep proxy theme around and destroy it when we don't need it anymore. Change-Id: I2fef7c295251af1cd944cea27531c1c117d34d51 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Relayout on setting the header or footer to nullKonstantin Ritt2016-04-092-8/+8
| | | | | | | | | | | | | | | | | | Passing null to i.e. Page's header resets the header item to Page's initial value, so that Page with unset header must look exactly like Page that never had header set. Change-Id: I553e5d2463e099723b74b0eec1b2224ae8ee970f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Relayout on the header|footer geometry and visibility changesKonstantin Ritt2016-04-092-10/+52
| | | | | | | | | | | | | | | | When the header or footer item's visibility changes, contentItem's geometry have to be adjusted. Change-Id: I9e73c48ff2301f8b371fc797ac4972ef5937b22f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: added src/controls to header and sourcedirs in qdocconf fileNico Vertriest2016-04-081-1/+3
| | | | | | | | | | | | Change-Id: I07d1b255baa741ae7c12ae2a04a348c5559f757c Reviewed-by: Martin Smith <martin.smith@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Make each style's 'base' directory available to initializeEngine()Mitch Curtis2016-04-084-4/+136
| | | | | | | | | | | | | | | | | | This is needed to register private QML files that are necessary for the implementation of some controls. Previously, this information was only available in registerTypes(). Change-Id: I9d0c293d6fad2afbf240771044165b048b77136c Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | Stop Button's pressAndHold once the button is not pressed anymoreKonstantin Ritt2016-04-071-1/+1
| | | | | | | | | | | | | | | | | | A custom-shaped Button's contains() could return false just anywhere within the content rect, so we should handle this exactly the same way as for the drag threshold overrun. Change-Id: Ie1665933be228334c6f95e97bd42e2dcd892b947 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Doc: Rename Qt Labs Controls to Qt Quick Controls 2Nico Vertriest2016-04-0738-68/+68
| | | | | | | | | | | | | | | | Replaced all remaining instances of "Qt Labs Controls" Change-Id: Iab8ca27d98a16a7c99bd364c66efc8b98d93eacc Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | Fix a typo for ToolTip registrationLiang Qi2016-04-041-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-52156 Change-Id: Ic299475adeef7142e717699ba787b35e66b552c1 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Vlad Stelmahovsky <vladstelmahovsky@gmail.com>
* | Doc: Rename Qt Labs Controls to Qt Quick Controls 2Venugopal Shivashankar2016-04-0117-42/+42
| | | | | | | | | | | | | | Replaced all remaining instances of "Qt Labs Controls" Change-Id: Iad784417b9b4ce015c11b4737dab2105b338ff5f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Improve documentation for delegate controlsMitch Curtis2016-04-013-1/+51
| | | | | | | | | | | | | | | | | | | | - Add "Delegate Controls" doc page. This will list future delegate controls, such as CheckDelegate, RadioDelegate and SwitchDelegate. - Add GIF for ItemDelegate. Change-Id: If8c66ab2178185f96d190f29ef7815beaa6e8d68 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Update Default style SpinBox to match new design specsMitch Curtis2016-03-311-2/+14
| | | | | | | | | | Change-Id: Ic1c8c678f24d2c17d34c1ea7df82bd92806e29b9 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | QQuickItemDelegate: remove unused private declarationsMitch Curtis2016-03-311-6/+0
| | | | | | | | | | Change-Id: I6525612814ff5f2d56db53c305aa4a6ea057dcea Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Dial: deduplicate binding.Anton Kudryavtsev2016-03-293-3/+3
| | | | | | | | | | | | | | Don't evaluate condition twice. Just use result of width. Change-Id: I38152353e7a2a5f60430684d38eb61140075d56f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | QQuickUniversalProgressRing: don't recreate rectangle in a loopAnton Kudryavtsev2016-03-291-1/+2
| | | | | | | | | | | | | | Just cache it. Change-Id: Ibc1ec94331be6b019834f39c570b9ec43aabbae7 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | QQuickMaterialProgressStrip: don't recreate rectangle in a loopAnton Kudryavtsev2016-03-291-1/+2
| | | | | | | | | | | | | | Just cache it. Change-Id: I3055352378b14e6ccebb6de91163f01da0b0b0d3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - doc updateVenugopal Shivashankar2016-03-2924-66/+70
| | | | | | | | | | | | | | | | | | | | | | | | - Change \title, \page, and \l instances that used "qtlabs" instead of "qtquick". - Renamed the qdocconf file and changed the qch parameters in it to use "Qt Quick Controls 2". - Added "2" as output suffix for the html filenames. Change-Id: Ia2fdd1c835229e5216f42a2fdfa5f7e11965e21d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | QQuickColorImageProvider: optimize string usageAnton Kudryavtsev2016-03-291-3/+3
| | | | | | | | | | | | | | | | | | Don't allocate memory to extract name: use QStringRef. Replace QStringLiteral with QL1S to use QStringBuilder. Extract color only when it's needed. Change-Id: Ic02315e95defcffecce0128fb175b1d4a08db817 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | QQuickUniversalFocusRectangle: optimize string usageAnton Kudryavtsev2016-03-291-2/+4
| | | | | | | | | | | | | | | | | | | | Replace QString::arg() chain with multi-arg overloaded function. It's faster because of args are replaced in one pass. While touching the code, also cache width and height of bound. Change-Id: Id8d19143f426ed1998713204dc9c8d4b51e58db5 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | QQuickUniversalFocusRectangle: proper construction of vectorAnton Kudryavtsev2016-03-291-1/+1
| | | | | | | | | | | | | | | | | | ... with known size and known value by according ctor. Don't use appending for this case. Change-Id: Ib2bf9703bb03bdfa628d1ae78c6d0353e991b3e4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | QQuickStyleSelector: optimize string usageAnton Kudryavtsev2016-03-291-12/+12
| | | | | | | | | | | | | | De-duplicate calls and cache results. Change-Id: Ia3424ac5149b947530e724b07adbff95cb54faf7 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Themes: cache result of QFont::family()Anton Kudryavtsev2016-03-282-8/+10
| | | | | | | | | | Change-Id: I5318a61dbb699e2f251d218e614c1a2ff02d53a7 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Default style RadioButton: deduplicate bindingAnton Kudryavtsev2016-03-261-1/+1
| | | | | | | | | | | | | | | | Don't evaluate condition twice. Just use result of parent.border.color Change-Id: Ib0c31fd5eba9d12cb95143c77e40514637028f8a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add support for specifying theme, accent & primary via envJ-P Nurmi2016-03-245-54/+117
| | | | | | | | | | | | | | | | Environment values take presedence over the default values requested in qtquickcontrols.conf, the same way than style name. Change-Id: I4641317bdce320c33a89f3614f3c782883c9c843 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Docs: add examples how to sync active states for ScrollBar & IndicatorJ-P Nurmi2016-03-234-0/+106
| | | | | | | | | | Change-Id: I353f9c8b0dec4eef71d27300645a1dc3cbca82cd Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Fix borders for top & bottom drawersJ-P Nurmi2016-03-232-2/+2
| | | | | | | | | | Change-Id: Ifeb927d7d3edde0b01b4ed666b6a19354171e605 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Inherit QQuickDrawer from QQuickPopupJ-P Nurmi2016-03-239-264/+349
| | | | | | | | | | | | Change-Id: Icf71270e63aedd93ba975ab9743de68c3a54e849 Task-number: QTBUG-51007 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Update Default style RadioButton to match new design specsMitch Curtis2016-03-231-4/+4
| | | | | | | | | | | | Change-Id: I35df7eef5ea47dc45d94a5c2c52e436c364a3fe4 Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Update Default style Switch to match new design specsMitch Curtis2016-03-231-6/+6
| | | | | | | | | | | | Change-Id: I3f566f138b3e26e75ad3e7ab36078ee04e5d627c Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Update Default style CheckBox to match new design specsMitch Curtis2016-03-236-4/+9
| | | | | | | | | | | | Change-Id: Ic828f82d38da4a16dc3d308cb67d94a11582768c Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Update Default style Button to match new design specsMitch Curtis2016-03-231-4/+7
| | | | | | | | | | | | Change-Id: Id95e48ee694cb205bf2f16acbc90b1cb54e6d596 Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Support ApplicationWindow attached property for items inside PopupJ-P Nurmi2016-03-231-0/+10
| | | | | | | | | | | | Change-Id: Ie8fb9fcf415670102d9364f85120bc315a8a067e Task-number: QTBUG-51991 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 00:50:38 +0000