aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/universal/qquickuniversalstyle_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-08-231-0/+7
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/material/qquickmaterialstyle.cpp src/imports/controls/universal/qquickuniversalstyle.cpp src/quicktemplates2/qquickpopup_p_p.h src/quicktemplates2/qquicktooltip.cpp tests/auto/auto.pro Change-Id: I88b347dd85278e14f7b2ca468e30648c6432b6f2
| * Universal: document the attached style propertiesMitch Curtis2016-08-191-0/+7
| | | | | | | | | | Change-Id: I390d3f9107f9e38e755f98060f74d63becba60cb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Introduce a 'System' theme to the styles.Friedemann Kleint2016-05-261-1/+1
|/ | | | | | | | | | | | | | | | Setting the theme to System chooses either the light or dark theme based on the system theme colors. However, when reading the value of the theme property, the value is never System, but the actual theme. [ChangeLog][Controls][Material] Added Material.System theme enum value, that can be used to let the Material style choose either the light or dark theme based on the system theme colors. [ChangeLog][Controls][Universal] Added Universal.System theme enum value, that can be used to let the Universal style choose either the light or dark theme based on the system theme colors. Change-Id: Ibfc9f01953cb8322b64d59413cfbaef9d4bb28fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Universal: add foreground and background attached propertiesJ-P Nurmi2016-04-181-0/+22
| | | | | | | | | | | | | | Same as b51e520f for Material. This has been a common request on the mailing lists and forums. Users want to customize the text color of various controls without having to replace whole delegates. This change makes it possible to specify both foreground (eg. Button text) and background (eg. ApplicationWindow, Page and Pane background) colors so that they propagate to children in the same way than accent and theme do. Change-Id: I55084c58f0c62e8088b270ed98437241e382ca15 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickUniversalStyle::variantToRgba()J-P Nurmi2016-04-181-0/+1
| | | | | | | Extracted from setAccent() - same as 8ed4c6c for QQuickMaterialStyle. Change-Id: Iadd791f3c2d9e5820a94bc8e84ce5d4c17156ae2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add invokable Universal.color() methodJ-P Nurmi2016-04-161-0/+2
| | | | | | | Material has it also. It's useful for getting the actual color values. Change-Id: I36de2e5802b3721179be95503b8b516d31682065 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickUniversalStyle: rename getColor() to systemColor()J-P Nurmi2016-04-161-1/+1
| | | | | Change-Id: I6b4799e929d032a3ddb5430acdbf6d816698d47a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Rename QQuickUniversalStyle::Accent to ColorJ-P Nurmi2016-04-161-2/+2
| | | | | | | | The same enum will be supported by the upcoming foreground and background attributes and is no longer accent -specific. Change-Id: Id579a1f08bdee1d92fb94a22e68c0fab0dc4e7a5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Universal: rename member variablesJ-P Nurmi2016-04-161-2/+2
| | | | | | | | | | Prepare for foreground/background support, which needs both "explicit" and "has" flags separately. The former describes better the effect on inheritance (explicitly set attributes override inherited values) vs. the latter describes whether a value has been set (in any ancestor). Change-Id: I0a9c91b3b24221d7286cb10fb63a00c71eae9791 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Align QQuickUniversalStyle::SystemColor valuesJ-P Nurmi2016-04-161-1/+1
| | | | | | | Unlike BaseHigh, the others didn't have any Color-suffix. Change-Id: Iacd797c86330f3ad1eff8f83735172d7475c00e4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Controls: update license headersJ-P Nurmi2016-04-141-2/+2
| | | | | | | This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. Change-Id: Ib653135662bfd353a73290539995e8e5be211587 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Controls: rename the C++ module to qtquickcontrols2J-P Nurmi2016-04-131-1/+1
| | | | | Change-Id: I087a39baebc296a340739161874636926adaa56c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-181-1/+1
| | | | | | | | | The imports will be done later, as we don't want to change them until the module is releasable (which requires things like selection handles, etc.). Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QQuickStyle to QQuickStyleAttachedJ-P Nurmi2016-03-161-3/+3
| | | | | | | | Make room for a public QQuickStyle class for configuring the style. Task-number: QTBUG-50787 Change-Id: I2a43436dd1815e3acd7e896a5847e41db42af5c4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* C++11 keywordsJ-P Nurmi2016-01-211-2/+2
| | | | | | | | - Q_NULLPTR -> nullptr - Q_DECL_OVERRIDE -> override Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Universal: add support for user-defined accent colorsJ-P Nurmi2015-12-251-7/+5
| | | | | | Change-Id: I23863519269deddb3a6007657fc93e83f33be842 Task-number: QTBUG-50103 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Universal style: read theme & accent from qtlabscontrols.confJ-P Nurmi2015-12-141-0/+2
| | | | | Change-Id: Ie41bf8a3b375835a07229eff49e6d10e3ff79992 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickStyleJ-P Nurmi2015-12-021-12/+5
| | | | | | | | | 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>
* Universal: move to QQuickProxyTheme way for font settingsLiang Qi2015-12-011-6/+0
| | | | | Change-Id: I90d91ceaea245dc19d2c0de683cb7c1172e1042e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Universal styleJ-P Nurmi2015-11-121-0/+221
https://dev.windows.com/design Change-Id: I1d8c633ae246724649a6ed71b300a56ba9572405 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 13:03:34 +0000