aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add MenuMitch Curtis2015-12-0218-0/+1169
| | | | | | | | | An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Control: resolve the font a bit earlierLiang Qi2015-12-018-1/+64
| | | | | | | Also applied to QQuickLabel, QQuickTextArea and QQuickTextField. Change-Id: Icf10500905980445809eb2375e8957db2c41e03c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: move to QQuickProxyTheme way for font settingsLiang Qi2015-12-016-3/+169
| | | | | Change-Id: Ib3fe1809887bbcf3db1822c6eb0182e0181cf70f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Universal: move to QQuickProxyTheme way for font settingsLiang Qi2015-12-0120-65/+178
| | | | | Change-Id: I90d91ceaea245dc19d2c0de683cb7c1172e1042e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Added defaultFont() for QQuickControl and etcLiang Qi2015-12-0115-1/+92
| | | | | | | | | | | | | | | The map between controls and QPlatformTheme::Font: * QQuickControl and etc: SystemFont * QQuickButton: PushButtonFont * QQuickToolButton: ToolButtonFont * QQuickCheckBox: CheckBoxFont * QQuickRadioButton: RadioButtonFont * QQuickLabel: LabelFont * QQuickGroupBox: MdiSubWindowTitleFont (tmp) * QQuickTabButton: DockWidgetTitleFont (tmp) Change-Id: If8c0239ece673941164fd97f52240ef27d97b950 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Added QQuickProxyThemeLiang Qi2015-12-013-0/+281
| | | | | Change-Id: I0e34c99564f30aef9ab17a8faa4ead6fa3829f5f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove QQuickMaterialStylePrivateJ-P Nurmi2015-11-302-134/+79
| | | | | | | | | 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>
* QQuickStyleSelector: add instance() static methodLiang Qi2015-11-303-30/+40
| | | | | Change-Id: Id2a412175f9907651d8e4e0fdacb624ac2444552 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickStyleSelector: move the style detection to constructorLiang Qi2015-11-302-12/+7
| | | | | | | Command line argument has more priority than environment variable. Change-Id: Id76f703d1d4395b6bae1a2e6be162a9250fb8dfa Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickStyleSelector: removed the env overrideLiang Qi2015-11-301-6/+0
| | | | | Change-Id: I0e42b339ddfff81ad9029cfbff14e21aee5178ff Reviewed-by: J-P Nurmi <jpnurmi@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>
* Universal: use QRgb instead of color namesJ-P Nurmi2015-11-281-73/+73
| | | | | | | | Constructing colors from QRgb (typedef unsigned int) is a million times faster than parsing named color strings. Change-Id: I01453c6d6c500e32736f3e331569e7034140c644 Reviewed-by: Liang Qi <liang.qi@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>
* Remove theme.json leftoverJ-P Nurmi2015-11-273-19/+0
| | | | | Change-Id: I7b8aaedf3a3c645db7bf6a1ca88472d8458de568 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Re-order imports.pro - styles togetherJ-P Nurmi2015-11-271-1/+1
| | | | | Change-Id: I59810b3b116ba8bd3aae938ab571ee83ce2802bd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* fix linking / usage on iOSJochen Seemann2015-11-273-3/+3
| | | | | | | | | | | | | | | | Using QtQC2 in an application on iOS was failing during linking with: duplicate symbol __Z13initResourcesv in: .../controls/libqtlabscontrolsplugin_iphonesimulator.a(qtlabscontrolsplugin.o) .../controls/material/libqtlabsmaterialstyleplugin_iphonesimulator.a(qtlabsmaterialstyleplugin.o) duplicate symbol __Z13initResourcesv in: .../controls/libqtlabscontrolsplugin_iphonesimulator.a(qtlabscontrolsplugin.o) .../controls/universal/libqtlabsuniversalstyleplugin_iphonesimulator.a(qtlabsuniversalstyleplugin.o) Making initResources() static inline as intended. Change-Id: I340b5eb711aaa195f4110f049bcc3a6eb84341cc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add high DPI variants of Dial's indicatorMitch Curtis2015-11-276-0/+4
| | | | | Change-Id: I56f9e26fa96955d25adf47c8963e7e23765266ba Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: add high DPI versions of check.pngMitch Curtis2015-11-275-0/+3
| | | | | | | | I didn't have the original SVG, so I remade it, hence the slight change in size. Change-Id: I24c8049655dbc379577b8c7913d2db31c12da6d2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update plugins.qmltypesMitch Curtis2015-11-271-45/+40
| | | | | Change-Id: I9cdb652f20deb3c0e7b1705d37f69ff4f954e233 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove ThemeMitch Curtis2015-11-2722-1023/+19
| | | | | | | | | Given the presence of alternative styles, we'd like to focus on making the default style as performant as possible. Removing Theme usage is a step towards this. Change-Id: I8f76dc98442e6c02703885591a44758f40c7a362 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QQuickFileSelector to QQuickStyleSelectorLiang Qi2015-11-267-50/+53
| | | | | | | Also moved to QtLabsControls lib. Change-Id: I8ed1256da2b9aa63db4ca3b51a0ace3ba730e542 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Implement more of default style designMitch Curtis2015-11-267-25/+32
| | | | | Change-Id: Ieaa2fa1b876d75f94f48a7fce0c47c166b969d57 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update Material editorsJ-P Nurmi2015-11-262-12/+40
| | | | | | | | | | | | | - hide the cursor and stop the timer when the editor doesn't have active focus - bring the cursor visible when gaining focus, and keep it visible while it's being moved - make use of QStyleHints::cursorFlashTime() - fix background positioning - set selection color to avoid the default blue Change-Id: I588f1f1cceaa2a6c9930cbdb1f0d1680117e0eef Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Optimize Material ItemDelegateJ-P Nurmi2015-11-261-87/+37
| | | | | Change-Id: I868475a828e35a08c3f9c65996e896863a372bae Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Optimize Material CheckBoxJ-P Nurmi2015-11-261-87/+37
| | | | | | | | | | | | | | | | | | | Before: tst_ObjectCount::material(CheckBox): QQuickItems: 5 (total of QObjects: 28 ) tst_CreationTime::material():"CheckBox": 0.28 msecs per iteration (total: 72, iterations: 256) After: tst_ObjectCount::material(CheckBox): QQuickItems: 5 (total of QObjects: 19 ) tst_CreationTime::material():"CheckBox": 0.20 msecs per iteration (total: 53, iterations: 256) Change-Id: I63a76f5bfb190655237d21d68397d5dc93941fe0 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Specify baseline offsetsJ-P Nurmi2015-11-2518-0/+18
| | | | | | Change-Id: I4845a7beac2edc0f0bcc1c810edd7d9e86f31c87 Task-number: QTBUG-49468 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add ItemDelegateJ-P Nurmi2015-11-2519-0/+734
| | | | | Change-Id: I133be230d0d4b2fd36565f8f05d91426c314a085 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material style: remove unnecessary QPainter operationsMitch Curtis2015-11-241-3/+0
| | | | | | | Change-Id: I4151421420838d66931aa00ab08ddbfecdf8944c Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix ScrollBar layoutingJ-P Nurmi2015-11-241-14/+26
| | | | | | | | | QQuickScrollBar was relying on itemGeometryChanged() for the attached flickable. If the flickable geometry didn't change _after_ scroll bar was attached, the bar was not positioned and resized as appropriate. Change-Id: I8f8695b468596acf570e028dae96f7c31d73ffba Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix ScrollIndicator layoutingJ-P Nurmi2015-11-241-14/+26
| | | | | | | | | | QQuickScrollIndicator was relying on itemGeometryChanged() for the attached flickable. If the flickable geometry didn't change _after_ scroll indicator was attached, the indicator was not positioned and resized as appropriate. Change-Id: Ib5b4816b4ba96ad73873722045ac4e3b7e47038d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Docs: remove bogus \qmlabstract from AbstractButtonJ-P Nurmi2015-11-241-1/+0
| | | | | Change-Id: I75ce73d77fdd5dfab824fb98ba8a7cd670316cc8 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickPaddedRectangleJ-P Nurmi2015-11-235-1/+333
| | | | | Change-Id: I72c535c2be99d345e1474a70e5c639f3b5a68e10 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Visualize Material Button's highlighted stateMitch Curtis2015-11-233-7/+46
| | | | | | Change-Id: I1c638c0b70a0ba8d0f5cfe1d7e41fd514c38c1c9 Task-number: QTBUG-49551 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: qualify resources (such as images) with a prefixMitch Curtis2015-11-232-2/+2
| | | | | Change-Id: Id59eee0982cc7dd197de26b6579947d615449d8b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Mark the controls plugin as "designersupported"J-P Nurmi2015-11-201-0/+1
| | | | | Change-Id: I0daf2780fdf7c9f9155a27e1f3ef2e1a28fb4052 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* Fix accessibility initializationJ-P Nurmi2015-11-202-0/+11
| | | | | | | | | | | | If accessibility is already enabled at construction time, QQuickControl does not get a notification of accessibility activation change. This patch fixes the issue that the attached property object was not created at all, by calling accessibilityActiveChange(true) when appropriate at component completion. Change-Id: I5d763d66c97a540687b217b8ae453d073f6bfdb4 Task-number: QTBUG-49361 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Adjust default style to match current specs.Mitch Curtis2015-11-1918-219/+115
| | | | | | | There are still more changes to come. Change-Id: I94ed2c5d649d72d90e43120841c2457091200b59 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove outdated paragraph from styling documentationMitch Curtis2015-11-191-5/+0
| | | | | Change-Id: If98b7296964b457e6a073cb232ca2ef1e024fb1d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Keep the overlay visible when there are any childrenJ-P Nurmi2015-11-171-6/+3
| | | | | Change-Id: I1446e88d7102ebae0e9933710e8e67d8ce925c5b Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ApplicationWindow: cleanup content item codeJ-P Nurmi2015-11-171-6/+3
| | | | | Change-Id: I0133870a273ff44a07ee1a372498c2c242a63b36 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: PanelJ-P Nurmi2015-11-171-5/+63
| | | | | Change-Id: Ifdf779c8a7ab85a303d4a018397b8700e48e85fd Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ApplicationWindow: introduce attached propertiesJ-P Nurmi2015-11-163-0/+185
| | | | | | | | The attached properties provide convenient direct access to an application window and its building blocks. Change-Id: I2d96842d80faec47c875156202c1e33a2af96ad3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Use QGuiApplicationPrivate::styleOverride for style optionLiang Qi2015-11-161-10/+4
| | | | | Change-Id: Iba15ea0a213036185e49acbabdb5d64cbdc28421 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Universal: handle Button::highlightedJ-P Nurmi2015-11-161-2/+2
| | | | | Change-Id: I060980e8110cdc9158ce7f1030186cbdbadbe48e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Cleanup & align the .pro filesJ-P Nurmi2015-11-166-12/+10
| | | | | | | | Remove some superfluous spaces, include paths, and module deps. Also, use more explicit QT_PRIVATE for private dependencies. Change-Id: I85d48213441749ab18442928a20cbb4c9c6dad0b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Align the Material style pluginJ-P Nurmi2015-11-165-13/+26
| | | | | | | | Specifically for static builds, use a unique name and explicit initialization for plugin resources. Change-Id: I2182386adfc5bbc5074f4dde6c9605b73207307b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add missing QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCIIJ-P Nurmi2015-11-168-7/+15
| | | | | | | http://lists.qt-project.org/pipermail/development/2012-February/002001.html Change-Id: Id6815c3bd9b196590b0c93b8ddf2f977cdc6a511 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Introducing Panel typeGabriel de Dietrich2015-11-149-0/+763
| | | | | | | | | | | | | | | | | | | | This is the base type to implement all sorts of Popups and Dialogs. Its main role is to keep the panel contents stacked on top of the application window contents and to ensure mouse and key events are forwarded or blocked depending on the visible panels modality. Currently, it only works with ApplicationWindow, which holds a QQuickOverlay. This special item is where the Panel contents gets reparented when the Panel becomes visible. It's also responsible for filtering the mouse events. Future developements may include adding a 'level' property instead of relying on the item's z value. This may or may not result into having several overlays per window. Change-Id: I18a4b8905e4d5a4a4697642b0553a1f9e86b669f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Button: add highlighted propertyMitch Curtis2015-11-132-0/+41
| | | | | | | | Since our focus is on embedded, this will be used as an alternative to the "isDefault" property that exists in Qt Quick Controls. Change-Id: I9b6612e3c3b30040295aeea6d217e90a17af4ebe Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 09:27:48 +0000