aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/universal/ComboBox.qml
Commit message (Collapse)AuthorAgeFilesLines
* Universal: implement hover effectsJ-P Nurmi2016-06-301-1/+2
| | | | | | | | [ChangeLog][Universal] Implemented hover effects Task-number: QTBUG-50003 Change-Id: I67d382b0aaef06fc9c16b734f735dcc62262b6f5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* ComboBox: make delegates respect hoverEnabled of the controlJ-P Nurmi2016-06-281-0/+1
| | | | | | | | The actual hover effects are coming in separate patches. Task-number: QTBUG-50003 Change-Id: I191cebf299998046a89b5653bd2858f65a7bca34 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Universal: remove qdoc markersJ-P Nurmi2016-06-081-10/+0
| | | | | | | | | | | | | The original plan was to include the default implementation (of all styles, if we could make the snippets collapsiple) in the customization docs. Since the default implementations tend to include internal types, in the end we went the other way and wrote dedicated example snippets for the customization docs. Therefore these markers no longer server a purpose, but just add unnecessary extra bytes for the QML parser to read. Change-Id: I5740192b0a3e80614a795d32dabeb753f86bbd68 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Controls: update all paddings to relative value with paddingLiang Qi2016-05-191-4/+4
| | | | | Change-Id: I7bf3a7fb9ca97e5c7ddf34f8f921d5d4be733861 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix colorized high-DPI indicatorsJ-P Nurmi2016-05-131-0/+2
| | | | | | | | | | | qtdeclarative commit f8c53e88 (Fix high-DPI image and svg providers) changed the way high-DPI image providers work. For images using an image provider, we must now set the source size to get the desired device pixel ratio... Change-Id: I47a90a9678ad43a54073d2cf1a2420925770c3ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* ComboBox: restore the old popup behaviorJ-P Nurmi2016-05-101-1/+1
| | | | | | | | Make the Popup follow ComboBox outside the horizontal screen bounds. Setting an explicit width instead of implicit width does exactly this. Change-Id: I46f4e5e40d5012929badf39d50d70b9a7811f455 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* ComboBox: separate indicatorJ-P Nurmi2016-04-281-9/+13
| | | | | | | | This makes it possible to hide or replace either ComboBox background or content item without losing the built-in indicator. Change-Id: I308bbaa8190eba04ff3048a20c2d2ed0431a24f2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Control: rename activeKeyFocus to visualFocusJ-P Nurmi2016-04-261-1/+1
| | | | | | | | | This is a bit more flexible, because the name is not strictly coupled with key focus. We can even add a (re)setter later if we want. This change only renames the property. Change-Id: I6707e44040f584480a8712df1af0915ae2829d57 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-211-2/+2
| | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* import Qt.labs.templates 1.0 => QtQuick.Templates 2.0J-P Nurmi2016-04-211-1/+1
| | | | | | | | | | | | | | Even though there never was such thing is QtQuick.Templates 1.0, we'll use version 2.0 to keep it in sync with QtQuick.Controls 2.0 (next step). The templates define (and in the future, revision) the API of the controls, so the two must have the same version or it will get messy. Docs and plugins.qmltypes will be updated in follow up commits. Change-Id: Idc2e76f32f348ba35eb4b1fa167c6868300aa910 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Universal: add foreground and background attached propertiesJ-P Nurmi2016-04-181-1/+3
| | | | | | | | | | | | | | 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>
* Remove references to non-existent ComboBox::downJ-P Nurmi2016-04-181-3/+2
| | | | | | | Such property doesn't exist, at least yet. Change-Id: I5d41997586e17a36d045648afc4c2fd4c64d10b8 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickAbstractButton::downMitch Curtis2016-04-151-3/+3
| | | | | | | | | | | | | | | | | This property will determine whether or not the button is visually pressed. Having such a distinction allows users more control over their controls. The patch also fixes the problem with ComboBox where pressing on the ComboBox when it's open would cause a delegate in the popup to show as being pressed. Unless explicitly set, this property follows the value of the pressed property. To return to the default value, set it to undefined. Change-Id: I29ecf325ed2ede125613f0c878b0427937599866 Task-number: QTBUG-51005 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* 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>
* Use Control.activeKeyFocus instead of Item.activeFocusJ-P Nurmi2016-04-111-1/+1
| | | | | | | | | | This makes the controls visualize focus only when interacting with keys, so this basically allows us to set for example Qt.StrongFocus policy by default on buttons and friends. Change-Id: I6c81c58b7acfd2bc592bdd12d804e7e48ee65e95 Task-number: QTBUG-51796 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-161-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | 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-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-041-1/+0
|\| | | | | | | | | | | | | Conflicts: src/templates/qquickpopup.cpp Change-Id: Ic5cdde7a2d9daa0e616de999969a4399db23245b
| * Universal: switch to distance field text renderingJ-P Nurmi2016-02-261-1/+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>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-311-2/+4
|\| | | | | | | | | | | | | | | | | Conflicts: src/templates/qquickpopup.cpp src/templates/qquickpopup_p_p.h src/templates/qquickspinbox_p.h Change-Id: Ief25ad2d27410f62e90879f60499ed87359406c3
| * Allow ComboBox popup to use more screen spaceJ-P Nurmi2016-01-301-1/+3
| | | | | | | | | | | | Change-Id: Icd2ee375d7886c1d4d61577fc9e196cfa5d910d1 Task-number: QTBUG-50758 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * ComboBox: enable scroll indicatorsJ-P Nurmi2016-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason this crashes: ScrollIndicator.vertical: ScrollIndicator { } But using the attached property via template works: T.ScrollIndicator.vertical: ScrollIndicator { } Good enough solution for now. :) Change-Id: I7a631a66ad24b1ddf7852c7c11d3850e49a52c9b Task-number: QTBUG-50757 Reviewed-by: J-P Nurmi <jpnurmi@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
| * ComboBox: lazy load the popup contentJ-P Nurmi2016-01-281-1/+1
| | | | | | | | | | | | | | | | On my Linux box, the creation time of ComboBox { model: 100 } goes down from ~4ms to 0.9ms. Change-Id: I8c3d8233d961c0b895581ba347d6789063a587a3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * ComboBox: add support for object arrayJ-P Nurmi2016-01-261-1/+1
| | | | | | | | | | | | | | Change-Id: Ia43ba18cfd7ce9f5c4c28e239645320af5ba41e7 Task-number: QTBUG-50141 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-251-20/+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
| * ComboBox: set implicit size for the popupJ-P Nurmi2016-01-231-2/+2
| | | | | | | | | | Change-Id: I6642a740c93c24cc86b4c7377def252390ca9f71 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Add Popup::parentJ-P Nurmi2016-01-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent defaults to the QML parent object where Popup is declared. Popup::x/y are relative to the parent, and the popup also automatically follows the parent as appropriate. QQuickPopupPositioner has been adapted from Qt Quick Controls 1. It was called QQuickScenePosListener, and it was implemented for the text selection handle popups. ComboBox's popup now follows the control eg. when scrolling, but the below/above positioning feature is temporarily gone missing. It will be restored in a follow up commit. Change-Id: I8a6b58cd74e07f33930abc35d0ab9da056685128 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Refactor PopupJ-P Nurmi2016-01-221-19/+17
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-191-3/+0
|\| | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp Change-Id: I1c8273012b01726072e5cbfd4369453a780ff03e
| * Universal: cleanup explicit font assignment from ComboBoxJ-P Nurmi2016-01-151-3/+0
| | | | | | | | | | Change-Id: Icd20013eda8df6d5b42dc199e68578492c104c44 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Support static buildsJ-P Nurmi2016-01-131-0/+1
|/ | | | | Change-Id: I17bb9131603da912597777b2ec0b9be3894ed858 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Universal: add support for user-defined accent colorsJ-P Nurmi2015-12-251-1/+1
| | | | | | Change-Id: I23863519269deddb3a6007657fc93e83f33be842 Task-number: QTBUG-50103 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Universal ComboBox: visualize key & mouse focus differentlyJ-P Nurmi2015-12-121-1/+1
| | | | | Change-Id: I90bc393e63027a4485228a73f571a513cfe5fcc4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Panel to PopupJ-P Nurmi2015-12-091-7/+6
| | | | | | | | | Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add ComboBoxJ-P Nurmi2015-12-041-0/+142
Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 04:20:43 +0000