aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Adjust qtlabscontrols.metainfoThomas Hartmann2016-04-121-10/+10
| | | | | | | | The '' confuses the designer. We will fix this but for now I change it to "". Change-Id: Ief4cfa3250e1dd1428dd972a7a10c5f6bd417033 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* Doc: fix ButtonGroup::buttons typeJ-P Nurmi2016-04-111-1/+1
| | | | | Change-Id: Id78ef819c56d4639c33e7b4823c2c2600486befa Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix ScrollBars with paddingsJoni Poikelin2016-04-014-8/+8
| | | | | | | | | | Padding was not taken into account when calculating the new position, which caused there to be small offset between the mouse press and the resulting handle position by the amount of padding used. Task-number: QTBUG-52233 Change-Id: Ibd8c4375b030a27a6124aefc4bc9af570d14d3a9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ComboBox: fix usage in an asynchronous LoaderJ-P Nurmi2016-03-231-4/+4
| | | | | | | | | | | | | The following comment in QQmlDelegateModel::object() helped to find a solution ie. using createdItem() instead of initItem(): If asynchronous is true or the component is being loaded asynchronously due to an ancestor being loaded asynchronously, item() may return 0. In this case createdItem() will be emitted when the item is available. [...] Change-Id: If3bf8e60834534ca07c8db8f502f4f11969057e8 Task-number: QTBUG-51972 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-224-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I40e902a2ddff05684ff90b178728c562c2cd8cd1 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Fix QQuickPopupPositionerJ-P Nurmi2016-03-221-3/+3
| | | | | | | | | | | tst_tooltip revealed a bug that QQuickPopupPositioner wasn't cleaning up its ancestor listeners properly. When QQuickPopup was destructed, it left a listener on the window root item. When the root item got later destructed, it tried to call a listener (the popup) that was already deleted. Change-Id: If041458da24be927f0bad19b9549dcabd1931977 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Popup: fix marginsJ-P Nurmi2016-03-214-7/+25
| | | | | | Change-Id: I09f974a00a5a2a8f14645ff5d9bfbd6bad03d324 Task-number: QTBUG-51990 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickOverlay: fix background visibility for multiple modal popupsJ-P Nurmi2016-03-171-1/+1
| | | | | | | | | | | | The idea of the "modalPopups > 1" check was to avoid calling QQmlProperty::write(), but it missed the fact that one modal popup might be still closing while a new modal popup is already opened. Thus, there's temporarily 2 modal popups visible, and we must transition the overlay background according to the state of the last shown modal popup. Change-Id: If25d83ccaa5adc29a9bc8d660f41fb66f90fb167 Task-number: QTBUG-51916 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: use proper shades for dark theme colorsNikita Krupenko2016-03-171-16/+28
| | | | | | | | This fixes colors for checked switch dark theme and raised highlighted button in both themes. Change-Id: I3c485fb1b779104d6d7f682921b34cb535312f7c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Change locale inheritance for popupsJ-P Nurmi2016-03-174-24/+14
| | | | | | | | | | The last one in the series of making Popup inherit its properties from the parent window instead of the parent item. The same change was done for font and style already. Change-Id: I7024cce13f501e92024e9110e87ed33bbae6533d Task-number: QTBUG-50984 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickStyle: fix random crashes accessing deleted QQuickPopupItemJ-P Nurmi2016-03-172-15/+8
| | | | | | | | | | Don't access QQuickPopupItem while being destroyed. The popup item is deleted in QQuickPopup destructor, which is the parent of QQuickStyle that is attached to a popup. We don't need to remove the listener in this case. Change-Id: I0e0dba533b3b1299eb0d266c92f3070bb193c6c9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: corrected default, ToolButton and checkable controls fontsNikita Krupenko2016-03-162-9/+3
| | | | | | | | | According to Android sources, ToolButton has the same font, as other buttons and checkable controls use default (system) font. Also, set proper size for default font. Change-Id: I355ab57ef476918bab346538fefbd6c0209d2221 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Store explicit and resolved font separatelyJ-P Nurmi2016-03-158-109/+91
| | | | | | | Change-Id: I80bd45244077cd75f24c4ca1af6485f4c6a23b39 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Change style inheritance for popupsJ-P Nurmi2016-03-154-15/+38
| | | | | | | | | | | | | | | | | | 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>
* QQuickControlPrivate::themeFont(): clear system font's explicit attrsJ-P Nurmi2016-03-151-3/+7
| | | | | | | | | | | | The default system font must not have explicit attributes that would mess with font inheritance. This is already handled by the QFont() default constructor, but we must do it ourselves when we call QPlatformTheme::font(SystemFont) directly. Change-Id: Ia52e135411618e72cbf4618cffb9eec7924dc612 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: fix a typo for Control.localeLiang Qi2016-03-111-1/+1
| | | | | | Change-Id: I37ad466462d42101fd16e8a09fe0c8486115f422 Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix popup fontsJ-P Nurmi2016-03-113-18/+4
| | | | | | | | | | | This is a partial revert of a405919. This change makes popups inherit the window font instead of the parent item font. Change-Id: Ie360e3831aadbd167859e17d381edf3a28945300 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Revert "QQuickControl: delayed the call of resolveFont()"J-P Nurmi2016-03-112-1/+8
| | | | | | | | | | | | | | | This reverts commit 3cba8b19c4e67cbcd6977bf141d7ddf2e54aae85. The change was done to implement font inheritance for popups, but it broke theme fonts for other controls. Since the former was a mistake (see comments in the linked bug report), it's best to revert back to what worked with theme fonts. Change-Id: I863765c5061b02607cfe04a848ff39e3243bd25f Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix font comparisonsJ-P Nurmi2016-03-115-13/+35
| | | | | | | | | | | | | | | | | | | | When inheritance of explicitly set font attributes is involved, it is important to compare the resolve mask in addition to comparing the attribute values to avoid losing the information whether a specific attribute is set explicitly. For example, QFont::operator==() returns true for two fonts that are both bold regardless of whether only one of them has explicit weight set. Therefore, setFont() must not ignore fonts resolve mask. Furthermore, the fontChanged() notifier must be emitted only if the actual attribute values change, not if only the resolve mask changes. Change-Id: I2eb7a071c0eaecd2f8d2f6074c4ce6ed6764a6e9 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* QQuickPopup: fix possible referencing of a destroyed parent itemJ-P Nurmi2016-03-101-0/+1
| | | | | | | | | | The internal popup positioner is already listening for itemDestroyed() of the parent item, so it may as well reset the parent item pointer of the popup to avoid having the popup referencing a destroyed parent in complex tooltip auto test cases coming up in 5.7. Change-Id: I463403e528c33285ea7d51b68d0f5020a239e98e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix QQuickPopupItemPrivate::implicitWidthChanged()J-P Nurmi2016-03-101-1/+1
| | | | | Change-Id: Ib822b57da21b338c7b11cae115f1bb6a178d7328 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* QQuickSpinBox: add missing null checkJ-P Nurmi2016-03-091-4/+7
| | | | | | | In auto tests, the engine might be null during destruction. Change-Id: I0556c746f6c47198afc937da052106d3f8c35558 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix static buildsMitch Curtis2016-03-071-1/+1
| | | | | | | | | | | The error was: Error in '.rcc\debug\qmake_Qt_labs_controls.qrc': Cannot find file 'C:/dev/qt5.7/qtquickcontrols2/src/imports/controls/designer/images/*.png' Change-Id: Icfd1225e8c130d8d48f821af981b64202c687956 Task-number: QTBUG-51708 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* SwipeView: cull items outside the viewJ-P Nurmi2016-03-071-0/+1
| | | | | | | | | | | | This hides them until they become visible in the view. Hiding them explicitly is not an option, because then they will never show up. This technique is used in QQuickItemView::initItem() and FxViewItem::setVisible(). Change-Id: I3a3779e11a57c6dcf94ffc834f6e920449aea74a Task-number: QTBUG-51078 Task-number: QTBUG-51669 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ComboBox: fix activationJ-P Nurmi2016-03-071-1/+1
| | | | | | | | | | The highlighted index is always -1 when the popup is hidden. Thus, when pressing enter/return, it should only activate the highlighted index when the popup is visible to avoid setting the current index to -1. Change-Id: I7a66e347bf2e4b62a67eb39b119ca1de299f16ef Task-number: QTBUG-51645 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix typo in the Pane styleKonstantin Ritt2016-03-043-3/+3
| | | | | | | Frame derives the Pane, not vice versa. Change-Id: I1a2bf0834efb44da7be21ded8aab01bafc42631f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix QQuickPopup::setParentItem()J-P Nurmi2016-03-021-1/+1
| | | | | | | | Don't call naturalControlFont() or calcLocale() with a null pointer, because it will crash. Change-Id: Ib4b6dba85e6c55832c30b5178b74ebf39429a5f8 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Material: enable Popup drop shadowJ-P Nurmi2016-03-011-0/+1
| | | | | | | | | The drop shadow was added in 7427e28, but it was never actually visible. It went unnoticed against the overlay background, because the popups in Gallery are modal... :p Change-Id: I043939098e8b45039a696f719fc414258d56c087 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Register QQuickItem revision 2J-P Nurmi2016-02-261-0/+1
| | | | | | | | | | | | This makes the following revisioned properties and invokable methods in QQuickItem available to QQuickControl and its subclasses: - activeFocusOnTab - rev1 - nextItemInFocusChain() - rev1 - grabToImage() - rev2 Change-Id: Id7ce43630c1f8d76dd58cc0944ec8a0b1e77c3ef Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Universal: switch to distance field text renderingJ-P Nurmi2016-02-2614-16/+0
| | | | | | | | | | | | Native text rendering is typically better on low density displays on Windows, but everywhere else, the distance field rendering gives better results. Our main target is not the classic GDI-based Windows desktop, but modern mobile typically with high density displays. Change-Id: Ibdaea09815a3915a720a04b2345e0c10c9753d2d Task-number: QTBUG-41432 Task-number: QTBUG-50971 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickPopup: fix uninitialized variableJ-P Nurmi2016-02-251-0/+1
| | | | | Change-Id: I339fdb284d65859b5df3a120fc806beaf950031b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Exclude designer support on iOSJ-P Nurmi2016-02-251-1/+1
| | | | | | | Causing build problems due to RCC'ing 'designer/images/*.png' Change-Id: I4d97d8514fa38e5d78b8a6b1b6647e3834c864d7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Implement accessibility support for Popup and MenuJ-P Nurmi2016-02-256-4/+48
| | | | | | Change-Id: I55067bb1cb9888be8e0e991fb73c9365d93d04f4 Task-number: QTBUG-51316 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix QQuickPopup to respect explicit sizeJ-P Nurmi2016-02-241-1/+4
| | | | | | | | | Don't resize the popup (clamping to its implicit size) unless the popup really has to be resized in order to fit the screen. Change-Id: I81201b77a1001ac22291ede1fc685f7208ff2916 Task-number: QTBUG-51322 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* RangeSlider: forward focus to the handlesJ-P Nurmi2016-02-242-0/+19
| | | | | | | | | | The active focus ends up to RangeSlider when using forceActiveFocus() or QML KeyNavigation. We must forward the focus to one of the handles, because RangeSlider handles key events for the focused handle. If neither handle has active focus, RangeSlider doesn't do anything. Change-Id: I61a53d0c7203fad64306b54c1f96093bd9312416 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* QQuickMaterialProgressStrip: reset the transformation matrixJ-P Nurmi2016-02-231-0/+1
| | | | | | | | | | The trasformation matrix for the indeterminate animation has to be reset when switching back to non-indeterminate mode, or else the indicator is translated to a wrong position. Change-Id: I8489a504f0b9626dbd0172ba0fba842f4528d027 Task-number: QTBUG-51312 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: fix typos in Qt.labs.calendarJ-P Nurmi2016-02-233-3/+3
| | | | | Change-Id: I13329270602d5b6e59d92dc412d72b2c4714c6c2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix CalendarModel month indicesJ-P Nurmi2016-02-231-6/+32
| | | | | | Change-Id: I25c683cce19436d103d3225ad098daedf6212b64 Task-number: QTBUG-51108 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: tweak the accent color and ripples for the dark themeJ-P Nurmi2016-02-221-2/+2
| | | | | | | | | | In general, the appropriate shade is 200 in the dark theme. Furthermore, reduce the translucency of the ripple in the dark theme to make it better visible. Change-Id: I6060dfbdb2d291eded56ca648e1356d6228e3b25 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Material: add missing focus highlightsJ-P Nurmi2016-02-226-4/+28
| | | | | | | Change-Id: Id678a095a56f7494c9f32160326ba667a6c0dc28 Task-number: QTBUG-51257 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Add icons for the QML DesignerJ-P Nurmi2016-02-2292-44/+43
| | | | | | Change-Id: If5a2e766eff51fb21d81c44f8313d7fdc2a67678 Task-number: QTBUG-50801 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Do not limit ComboBox menu to predefined valueNikita Krupenko2016-02-212-2/+2
| | | | | | | | | This allows ComboBox menu to occupy more screen space and use the window size as limit. Task-number: QTBUG-50758 Change-Id: If430338f7baa291406f3ad0657d0cb267e17a3a2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Popup: use available size and paddings from the popup itemJ-P Nurmi2016-02-194-187/+71
| | | | | | | | | | | | | | | | Now that the internal popup item inherits Control, which already provides these features, we may use them directly instead of re-doing them in Popup. NOTE: QQuickMenu code has lots of direct references to the content item, which used to be stored in QQuickPopupPrivate, which is the base class of QQuickMenuPrivate. Now that the content item is stored by QQuickPopupItem instead, the direct references don't work. Thus, as a temporary solution to avoid this patch growing large, we'll store the content item in QQuickMenuPrivate. Change-Id: I80a16d34432131a4326c1b6ae54419470be53f96 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Recommend the use of ApplicationWindow with popupsMitch Curtis2016-02-192-1/+38
| | | | | | | | It's important to mention that ApplicationWindow provides some extra support for popups. Change-Id: Iecea78d9d4446bbc4694fcde0166d1b1c2fb62ee Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Controls: fix locale inheritance for popupsLiang Qi2016-02-193-10/+28
| | | | | | | | | QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its locale from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: Ie5908f86a154502962d6406dd4067b46cc527de7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: make MenuItem highlight visible against any backgroundJ-P Nurmi2016-02-191-1/+1
| | | | | | | | | Same what f56ec245 did to ItemDelegate. Use a translucent color for the highlight, so that the exact background color doesn't matter. Change-Id: I9e1673bbc3e7348b15854d623ee0c37aea51f231 Task-number: QTBUG-51118 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Controls: fix font inheritance for popupsLiang Qi2016-02-183-5/+23
| | | | | | | | | QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickControl: delayed the call of resolveFont()Liang Qi2016-02-182-8/+1
| | | | | Change-Id: Iadfbc3a39de102825c9dde60a236883b88834b34 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: return proper themeFont() for controlsNikita Krupenko2016-02-173-6/+31
| | | | | | | This allow to get proper fonts for most controls. Change-Id: I4b43ce05b09c30f59dca7d23e8d890fa9dfb74ab Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 02:09:18 +0000