aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls/qquickstyle.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Rename Qt Labs Controls to Qt Quick Controls 2Nico Vertriest2016-04-071-1/+1
| | | | | | | | 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>
* Doc: Rename Qt Labs Controls to Qt Quick Controls 2Venugopal Shivashankar2016-04-011-5/+5
| | | | | | | Replaced all remaining instances of "Qt Labs Controls" Change-Id: Iad784417b9b4ce015c11b4737dab2105b338ff5f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add public API for setting and getting the style from C++J-P Nurmi2016-03-171-0/+168
| | | | | | | | TODO: setup QtLabsControls C++ module docs Task-number: QTBUG-50787 Change-Id: I382bad34df88d13fb9a74b3d2f9203280dfb4a66 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QQuickStyle to QQuickStyleAttachedJ-P Nurmi2016-03-161-236/+0
| | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-161-62/+57
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp src/templates/qquickcontrol.cpp src/templates/qquickcontrol_p.h src/templates/qquickpopup.cpp tests/auto/controls/data/tst_combobox.qml tests/auto/controls/data/tst_control.qml Change-Id: Ib7853d5ee5c4444872cd5c2d789e20d229c955d1
| * Change style inheritance for popupsJ-P Nurmi2016-03-151-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decision to make popups inherit theme & accent from its parent item was driven by ComboBox. However, in many cases it has an undesired side effect, so we've changed Popup to inherit its style attributes from the parent window instead, just like we did for fonts. The only exception to this is ComboBox, where the popup is an integral part of the control. This special case is now handled in the respective style implementation. A concrete example is that we can now specify dark theme by default for Material style ToolBar to get a better matching light text against the colorful background. In Gallery, this won't effect the options menu, which is a child of a ToolButton. The menu retains light theme along the rest of the application. Change-Id: Ibdc8fcf5b5fa258d853410a9b40368472424a8c6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Revert popup style inheritance changesJ-P Nurmi2016-03-151-54/+36
| | | | | | | | | | | | | | | | | | | | | | This is a partial revert of "Fix style inheritance" (07e0dec) and "Fix style inheritance for popups" (a3dddf0). These changes made things too complex. It's easier to revert back to the original, and then apply the new popup style inheritance rules in the next commit. Change-Id: I2842261999d258a709739ee48a78ca23a2a1092a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-281-2/+2
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/material/qtlabsmaterialstyleplugin.cpp src/templates/qquickapplicationwindow_p.h src/templates/qquickcombobox.cpp src/templates/qquickcombobox_p.h src/templates/qquickpopup.cpp Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478
| * Add QQuickPopup::popupItem()J-P Nurmi2016-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though I didn't want to expose this, because I'm still hoping we could make QQuickPopup inherit QQuickControl in the future, the fact that QQuickPopupPrivate::get(popup)->popupItem was used in so many places is a good indicator that accessing the popup item is often required when dealing with popups. In any case, this is C++ only API and not exposed to QML, so it's not that big deal... and we can always deprecate it later and make it return "this" should the item plans come true. Change-Id: I6b99a499327d838ee61eae70f8ebf8e77f00ae39 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-251-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Refactor PopupJ-P Nurmi2016-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | Added relevant properties to make it almost like a Control: x, y, width, height, padding, background... This change makes popup use an internal item where the style/user-supplied contentItem and background are re-parented. This way we can provide a default style (background) for Popup. Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | C++11 keywordsJ-P Nurmi2016-01-211-4/+4
| | | | | | | | | | | | | | | | - Q_NULLPTR -> nullptr - Q_DECL_OVERRIDE -> override Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-191-23/+30
|\| | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp Change-Id: I1c8273012b01726072e5cbfd4369453a780ff03e
| * QQuickStyle: remove global constant SettingsFilePathAnton Kudryavtsev2016-01-181-3/+1
| | | | | | | | | | | | | | and use QStringLiteral in settings() function Change-Id: I6a7d94f8ab07a3e77df858f25ba585165c951b24 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Fix style inheritanceJ-P Nurmi2016-01-151-20/+29
| | | | | | | | | | | | Change-Id: I46f4ea38d21f0f6a22bd247e02fe92a5b0d0d454 Task-number: QTBUG-50470 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Controls: replace foreach with range-based forAnton Kudryavtsev2016-01-151-5/+8
|/ | | | | Change-Id: I3ad37008e2cdcde62efecfb5e2ec2373026c4439 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix style inheritance for popupsJ-P Nurmi2016-01-081-29/+39
| | | | | | Change-Id: I7bc36cb68e8d668fff2270e018de7eb1c71ccd20 Task-number: QTBUG-50347 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Use QFileSelector for qtlabscontrols.confJ-P Nurmi2015-12-191-1/+3
| | | | | | | | | | | Allows setting different defaults for different platforms, for example: qtlabscontrols.conf:Style=Default +android/qtlabscontrols.conf:Style=Material +windows/qtlabscontrols.conf:Style=Universal Change-Id: Ie84408f996bd665c343c2d73d5ec26c37c6c2491 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add QQuickStyle::settings()J-P Nurmi2015-12-141-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loads ":/qtlabscontrols.conf" from resources. The next step is to make it possible to specify the preferred theme and accent in qtlabscontrols.conf. Different values can be specified for each style, which will take effect when running the app using the respective style. These are the preferred or default values, which can be overridden in code. [Controls] Style=material [Universal] Theme=Dark Accent=Red [Material] Theme=Light Accent=Brown The reason for using our own qtlabscontrols.conf file instead of re-using qt.conf is that qt.conf is strictly purposed for specifying the standard Qt paths for deployment setups. If qt.conf missing paths for QLibraryInfo, Qt fails to load the platform plugin: This application failed to start because it could not find or load the Qt platform plugin "windows|cocoa|xcb". Change-Id: I8da7f0859f004db8adf585b830bce4aa8e7713a9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickStyleJ-P Nurmi2015-12-021-0/+201
| | | | | | | | | 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>
* Implement Style as an attached propertyJ-P Nurmi2015-03-111-204/+0
| | | | | Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Add missing includesFrederik Gladhorn2015-03-061-0/+2
| | | | | Change-Id: I3459e45aa8afb6c3b7fc900f0b34b0c8ff771f10 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* QQuickStylableJ-P Nurmi2015-03-031-0/+34
| | | | | Change-Id: I9017c192d5d42724589a5cbdbdb6705be4c552b5 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Import the Qt Quick Controls 2 prototypeJ-P Nurmi2015-02-051-0/+168
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 09:52:11 +0000