aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qquickmaterialstyle.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-251-20/+105
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/templates/qquickcombobox_p.h src/templates/qquickmenu_p.h src/templates/qquickmenu_p_p.h src/templates/qquickoverlay_p.h src/templates/qquickpopup.cpp src/templates/qquickpopup_p.h src/templates/qquickstackview_p.cpp Change-Id: I89c7d518697beec0b81ef3a12205286a4f3ccf89
| * Cleanup unused docs from qquickmaterialstyle.cppJ-P Nurmi2016-01-201-15/+0
| | | | | | | | | | | | | | | | The Material style and its attached property are documented in qtlabscontrols-material.qdoc. Change-Id: Ic924f2a1ca236343182d938ab1991a20d013a57a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Material: default primary to Indigo & accent to PinkJ-P Nurmi2016-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | These colors are used as an example in the Google Material Design Guidelines, and as defaults in Android Studio app templates. Change-Id: I6236e4fd388817e05e22ec0b7aadedb3fae68fa1 Task-number: QTBUG-50330 Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Restore Material::primaryJ-P Nurmi2016-01-201-4/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | The idea was that users would simply configure a different accent color for the toolbar, but the only way to do this is in code, which creates a hard dependency to the material style. A separate primary color makes it possible to configure both colors in :/qtlabscontrols.conf, which nicely avoids style specific dependencies. Change-Id: Ia5ad92b57f9aea32e16e9260117e8d32b3356556 Task-number: QTBUG-50329 Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-191-297/+421
|\| | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp Change-Id: I1c8273012b01726072e5cbfd4369453a780ff03e
| * Improve Material & Universal warningsJ-P Nurmi2016-01-141-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: QQuickMaterialStyle: unknown accent "foo" After: qrc:/main.qml:28:9: QML CheckBox: unknown Material.accent value: foo Furthermore, before invalid values in :/qtlabscontrols.conf were silently ignored. Now it gives a clear warning: :/qtlabscontrols.conf: unknown Material theme value: foo Change-Id: I0be4eb26ffe23643e282197dc76a091801ab2f4d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Material: add support for user-defined accent colorsJ-P Nurmi2016-01-141-294/+416
| | | | | | | | | | | | Change-Id: Ia88cfcb307d03977c45bff32ad2b1d290d183a57 Task-number: QTBUG-50178 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Imports: replace foreach with range-based forAnton Kudryavtsev2016-01-151-2/+4
|/ | | | | Change-Id: I31bc93c2b3f6ecbd0680dc9d626626c4fe57eec8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove unused Material::primaryJ-P Nurmi2015-12-251-48/+0
| | | | | Change-Id: Ied4c732ed9147f6f8f03b7165057e74a17274b7f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: use QRgb instead of color namesJ-P Nurmi2015-12-191-318/+318
| | | | | | | | | | Constructing colors from QRgb (typedef unsigned int) is an order of magnitude faster than parsing named color strings. The same change was applied to Universal in 87a4d34. Change-Id: I3d44e913fe48a8fb2b7c1caf5f84e3291e60945d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material style for MenuJ-P Nurmi2015-12-181-2/+2
| | | | | Change-Id: Ifb00d1ddfc326cf206f6d1ffd93ccbe248eb5a3d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Overlay::background that is shown when any modal popup is openJ-P Nurmi2015-12-151-0/+5
| | | | | Change-Id: Idc2a5bbb5cf7a08ff21731537a378b1dd8050833 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material style: read theme, accent & primary from qtlabscontrols.confJ-P Nurmi2015-12-141-4/+35
| | | | | Change-Id: Ie55978ae9c76789cf7796752ceefd183c063662b Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add ComboBoxJ-P Nurmi2015-12-041-0/+5
| | | | | Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickStyleJ-P Nurmi2015-12-021-70/+50
| | | | | | | | | Now that we have a good place for it, we can share a common base class for QQuickMaterialStyle and QQuickUniversalStyle. QQuickStyle implements the inheritance pattern for attached styles, in one place. Change-Id: I459d98f96ce7c6de1ce7ef716e859f459278d8ad Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Remove QQuickMaterialStylePrivateJ-P Nurmi2015-11-301-132/+68
| | | | | | | | | This paves the road for QQuickStyle, a common base class for QQuickMaterialStyle and QQuickUniversalStyle. QQuickStyle will be in a static library -> no BC requirements -> no pimpl. Change-Id: Ibac37bef3a9282a3b7aaf29c4de854cab3cd8d7d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickMaterialStyle: move colors into a static const C-arrayJ-P Nurmi2015-11-301-288/+335
| | | | | | | | | | Populating and accessing is faster than QHash, and the array is initialized once per application. The original hash map was also meant to be static, but it slipped in as non-static meaning that the colors were initialized once per style instance. Change-Id: I915615a4294e11f49d2fb47b3c50f0e5c50adbe2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Cleanup unused QQuickMaterialStylePrivate::MethodJ-P Nurmi2015-11-281-2/+0
| | | | | Change-Id: I0e33ff9d87b336e7b55958632c4ee5440d2e7916 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickMaterialStyle: remove duplicate QQuickItemChangeListenerJ-P Nurmi2015-11-281-6/+3
| | | | | Change-Id: I45582349a97f0ed5b265da4d4f617b1f12f0d48d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Visualize Material Button's highlighted stateMitch Curtis2015-11-231-3/+31
| | | | | | Change-Id: I1c638c0b70a0ba8d0f5cfe1d7e41fd514c38c1c9 Task-number: QTBUG-49551 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Material styleMitch Curtis2015-11-121-0/+765
Change-Id: I93662a53b42858a5b65154c5ede334182e738dde Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 13:24:22 +0000