aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qquickmaterialstyle_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Introduce ToolTipJ-P Nurmi2016-03-221-0/+2
| | | | | | Change-Id: I917f7e83219788fc63389773eb07ee39757bed7f Task-number: QTBUG-51003 Reviewed-by: Mitch Curtis <mitch.curtis@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>
* Add SwipeDelegateMitch Curtis2016-03-151-0/+8
| | | | | | | | | | SwipeDelegate presents a view item that can be swiped left or right to expose more options or information. It is used as a delegate in views such as ListView. Change-Id: I7533a2b223f652993b6cee730930ea6dc125c869 Task-number: QTBUG-51610 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-151-0/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4aae04ab8cac381b4a8262a2f47298ca014f4692
| * ItemDelegate: make the highlight visible against any backgroundJ-P Nurmi2016-02-151-0/+2
| | | | | | | | | | | | | | | | | | Use a translucent color for the highlight, so that the exact background color doesn't matter. Change-Id: I63348137dedd04aca8110b8f7610506ca003ec87 Task-number: QTBUG-51118 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-251-0/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Restore Material::primaryJ-P Nurmi2016-01-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* Material: add support for user-defined accent colorsJ-P Nurmi2016-01-141-7/+9
| | | | | | Change-Id: Ia88cfcb307d03977c45bff32ad2b1d290d183a57 Task-number: QTBUG-50178 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove unused Material::primaryJ-P Nurmi2015-12-251-14/+0
| | | | | Change-Id: Ied4c732ed9147f6f8f03b7165057e74a17274b7f Reviewed-by: Mitch Curtis <mitch.curtis@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/+2
| | | | | Change-Id: Idc2a5bbb5cf7a08ff21731537a378b1dd8050833 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material style: read theme, accent & primary from qtlabscontrols.confJ-P Nurmi2015-12-141-0/+2
| | | | | Change-Id: Ie55978ae9c76789cf7796752ceefd183c063662b Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add ComboBoxJ-P Nurmi2015-12-041-0/+2
| | | | | Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickStyleJ-P Nurmi2015-12-021-12/+6
| | | | | | | | | 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-2/+11
| | | | | | | | | 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>
* Visualize Material Button's highlighted stateMitch Curtis2015-11-231-0/+10
| | | | | | Change-Id: I1c638c0b70a0ba8d0f5cfe1d7e41fd514c38c1c9 Task-number: QTBUG-49551 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Material styleMitch Curtis2015-11-121-0/+214
Change-Id: I93662a53b42858a5b65154c5ede334182e738dde Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 01:13:37 +0000