aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* CheckBox: migrate from label to contentItemJ-P Nurmi2016-02-066-41/+29
| | | | | Change-Id: Ie35fc6a9a5424c6f002480fc461b7cd5fe84753b Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* TabButton: migrage from label to contentItemJ-P Nurmi2016-02-063-33/+18
| | | | | Change-Id: I026bca7620235fbdd5e8b870c7e4f643ae0dcf49 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ToolButton: migrage from label to contentItemJ-P Nurmi2016-02-066-38/+23
| | | | | Change-Id: Iacc8ba21e48f40062d0784c76d33dbf79ce803e0 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Button: migrate from label to contentItemJ-P Nurmi2016-02-066-37/+23
| | | | | Change-Id: Icccab45dec0dafc907847eb0151b60bd9320ab9a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-3117-41/+88
|\ | | | | | | | | | | | | | | | | Conflicts: src/templates/qquickpopup.cpp src/templates/qquickpopup_p_p.h src/templates/qquickspinbox_p.h Change-Id: Ief25ad2d27410f62e90879f60499ed87359406c3
| * Make popups work without ApplicationWindow, to some degreev5.6.0-rc1v5.6.0J-P Nurmi2016-01-302-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using ApplicationWindow is highly recommended. First of all, with a plain Window, QQuickPopup attempts to set a high z-value, but cannot guarantee correct stacking order. Secondly, we cannot provide style- specific background dimming for modal popups, because it is styled as part of ApplicationWindow. Last but not least, QQuickPopup has to install a window-level event filter, which is far less efficient than how event handling done in QQuickOverlay. Change-Id: I08915abce7a1764177b92f7539eef77c054a405a Task-number: QTBUG-49921 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Allow ComboBox popup to use more screen spaceJ-P Nurmi2016-01-303-3/+9
| | | | | | | | | | | | Change-Id: Icd2ee375d7886c1d4d61577fc9e196cfa5d910d1 Task-number: QTBUG-50758 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Update plugins.qmltypesJ-P Nurmi2016-01-302-6/+20
| | | | | | | | | | Change-Id: I1b7c15c57ca491561bf082ab53967455a6299529 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Material ComboBox: round popup cornersJ-P Nurmi2016-01-301-0/+1
| | | | | | | | | | Change-Id: I644ab29bd814119cd3b631925cded8fc5bda4244 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * CheckBox: support partially checked state for Default & UniversalJ-P Nurmi2016-01-302-5/+28
| | | | | | | | | | | | Change-Id: Id2614c2f441718ef21445ef42c7d64ff64e072ce Task-number: QTBUG-49961 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Material CheckBox: fix disabled stateJ-P Nurmi2016-01-301-1/+1
| | | | | | | | | | Change-Id: Ia0b95ed25cad55477d90038db39ac22a6a3932ed Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Material: adjust sizes of checkable controlsNikita Krupenko2016-01-293-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | Made Switch indicator and handle smaller to be more like the native switch on Android. Also, increased the sizes of Switch and its Ripple CheckBox, and RadioButton to to correspond minimum touch target size 48x48. Change-Id: Icce70215910b677d989182fbb3b40161033601f8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Update TabBar and TabButton screenshotsJ-P Nurmi2016-01-293-0/+0
| | | | | | | | | | Change-Id: I5aec1c2a08b24e1779e62b9580a740fb102c1561 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * ComboBox: enable scroll indicatorsJ-P Nurmi2016-01-293-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Tweak default style tabsJ-P Nurmi2016-01-292-7/+2
| | | | | | | | | | | | | | | | | | Remove the explicit font size leftover, and tweak the implicit size bindings so that neither tst_accessibility nor tst_snippets throws any binding loop warnings. Change-Id: Ib60dc8a1fca33b14171320db3f37e65c046f5898 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Default SpinBox: sync colors with TextField and TextAreaJ-P Nurmi2016-01-291-2/+2
| | | | | | | | | | Change-Id: Ibbc6dda27172425250e0543817b4ab5b303bded5 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-2854-513/+1359
|\| | | | | | | | | | | | | | | | | | | | | 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
| * Universal: center align button textJ-P Nurmi2016-01-282-2/+2
| | | | | | | | | | | | Change-Id: I240b4bb7d59f806584d89c93560cc0da39a77d56 Task-number: QTBUG-50712 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Default TextArea: sync colors with TextFieldJ-P Nurmi2016-01-281-3/+4
| | | | | | | | | | Change-Id: I423c78ab33f78032471db64804885ba60671d93b Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * StackView: mirror transitions in right-to-leftJ-P Nurmi2016-01-283-15/+15
| | | | | | | | | | Change-Id: I5a8a231be3fed56185066dd9d939d1b898083a68 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * ComboBox: lazy load the popup contentJ-P Nurmi2016-01-283-3/+3
| | | | | | | | | | | | | | | | 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>
| * QML Designer: add a bunch of missing controls and propertiesJ-P Nurmi2016-01-2816-114/+724
| | | | | | | | | | Change-Id: I29e286b9df08fc531f053158da379c5d6898bada Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * AbstractButton: remove the mouse params from signalsJ-P Nurmi2016-01-282-186/+8
| | | | | | | | | | | | | | | | If we ever want to expose these, the name would be something else than "mouse"... :) Change-Id: Ie9dad16e84708059fd0b43d4764925db7b014d64 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Material ProgressBar: implement indeterminate animatorJ-P Nurmi2016-01-285-31/+367
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The indicator is now a single QQuickItem, and runs in the render thread, so keeps animating even if the app is busy. Before: RESULT : tst_CreationTime::material():"ProgressBar": 0.30 msecs per iteration (total: 79, iterations: 256) After: RESULT : tst_CreationTime::material():"ProgressBar": 0.18 msecs per iteration (total: 93, iterations: 512) Change-Id: I3ec0982da9a02751725692c72da10a01d2afbfdc Task-number: QTBUG-50161 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Replace Popup::pressed|releasedOutside with close policy flagsJ-P Nurmi2016-01-282-6/+0
| | | | | | | | | | Change-Id: I3e09c4e2b6cbbe39bdf9e943905664e5dc1fe954 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Add Popup::closePolicyJ-P Nurmi2016-01-282-0/+20
| | | | | | | | | | Change-Id: Ie3d0f50a59aeaab36ec388af897cbf2596269ce3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Material Menu: round cornersJ-P Nurmi2016-01-271-0/+1
| | | | | | | | | | Change-Id: Iafc571cc2b18a0c68d0cf7fca6d6775062f710f1 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Material ProgressBar: remove paddingJ-P Nurmi2016-01-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other styles don't have padding either. No padding makes it possible to put a ProgressBar at the bottom of a ToolBar or other AppWindow header, which is common in mobile apps these days. ApplicationWindow { visible: true header: ToolBar { ProgressBar { value: 0.5 width: parent.width anchors.bottom: parent.bottom background.visible: false } } } } Change-Id: Ia43c5bfd0b58dafd5ff0ad4c65fa95f156622aa4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * ComboBox: add support for object arrayJ-P Nurmi2016-01-263-3/+3
| | | | | | | | | | | | | | Change-Id: Ia43ba18cfd7ce9f5c4c28e239645320af5ba41e7 Task-number: QTBUG-50141 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Default style tabsJ-P Nurmi2016-01-252-30/+6
| | | | | | | | | | | | | | | | We don't have a design yet, so this is just something improvised based on the old flat style tab design & adapted to default style colors. Change-Id: Icd08d32bb08a97ac4cba21a647dbd5b043cb7c91 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Make default style SpinBox behave better when resizedJ-P Nurmi2016-01-251-1/+3
| | | | | | | | | | Change-Id: If2ddb2c65fec2a0159d740c788b7f21c1c7f0637 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Material: move DropShadows back to layer.effectJ-P Nurmi2016-01-254-73/+37
| | | | | | | | | | | | | | | | QTBUG-49979 was fixed, so we can switch back to using layer.effect, which typically leads to one less item and much less bindings. Change-Id: I7d1d1462a90c674b5f849134bb6ac8fe6ff0f231 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Containers: use the implicit size of the contentItemJ-P Nurmi2016-01-2515-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The result of: Frame { ColumnLayout { RadioButton { text: "First" } RadioButton { text: "Second" } RadioButton { text: "Third" } } } is now identical to: Frame { contentItem: ColumnLayout { RadioButton { text: "First" } RadioButton { text: "Second" } RadioButton { text: "Third" } } } Change-Id: I823b2259dabb66db0dddef41ea396f7ac1000a82 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Update plugins.qmltypesJ-P Nurmi2016-01-252-12/+133
| | | | | | | | | | Change-Id: I26a8ae03e57df79fa87e26c3b650a49f2b89aeac Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Add Popup::transformOriginJ-P Nurmi2016-01-253-2/+3
| | | | | | | | | | Change-Id: I4a52468234f0479c1b8feb102e07686e3235ba3f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-2530-187/+447
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-233-6/+6
| | | | | | | | | | Change-Id: I6642a740c93c24cc86b4c7377def252390ca9f71 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Menu: set implicit size instead of explicit sizeJ-P Nurmi2016-01-233-12/+12
| | | | | | | | | | Change-Id: I68f25669379043bbe19b61428cd85dba7eb2ae70 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Popup: add implicit & content sizesJ-P Nurmi2016-01-233-12/+21
| | | | | | | | | | | | | | Behaves the same way than the Pane/Frame/GroupBox container controls. Change-Id: I370f3961b77a363a63a0a64fc629cc5da6dfd53f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Add Popup::parentJ-P Nurmi2016-01-233-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Universal style for PopupJ-P Nurmi2016-01-222-0/+57
| | | | | | | | | | Change-Id: I39b5a473f56ea05d26e9b28eef30364c9281d137 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Refactor PopupJ-P Nurmi2016-01-228-102/+142
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Docs: move "Getting Started with Qt Labs Controls" on its own pageJ-P Nurmi2016-01-202-41/+71
| | | | | | | | | | | | | | | | | | | | Makes the landing page a bit less crowded so it's easier to find the essential information that is browsed and searched repeatedly during development. The getting started page is presumably just read once to get familiar with the controls. Change-Id: I29fe4089fd4dbf497acb18777be60d1ba9920f7e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Default: add subtle fill color for buttons and alikeJ-P Nurmi2016-01-206-7/+7
| | | | | | | | | | | | Change-Id: I287032a103046b23e1238152f8d527b3d02f23d1 Task-number: QTBUG-50327 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Cleanup unused docs from qquickmaterialstyle.cppJ-P Nurmi2016-01-201-15/+0
| | | | | | | | | | | | | | | | The Material style and its attached property are documented in qtlabscontrols-material.qdoc. Change-Id: Ic924f2a1ca236343182d938ab1991a20d013a57a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Material: default primary to Indigo & accent to PinkJ-P Nurmi2016-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | These colors are used as an example in the Google Material Design Guidelines, and as defaults in Android Studio app templates. Change-Id: I6236e4fd388817e05e22ec0b7aadedb3fae68fa1 Task-number: QTBUG-50330 Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Material: make ToolBar to use the primary colorJ-P Nurmi2016-01-201-1/+1
| | | | | | | | | | | | | | Change-Id: Ie9035ea4d5e1cdf5807b73b92115d886691e8fa7 Task-number: QTBUG-50330 Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Restore Material::primaryJ-P Nurmi2016-01-203-19/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Docs: add notes about the Qt.labs moduleJ-P Nurmi2016-01-199-0/+18
| | | | | | | | | | Change-Id: I65c37f661689bf30e7a9119bb877dce68eeb634c Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
| * Doc: fix MonthGrid brief descriptionJ-P Nurmi2016-01-191-1/+1
| | | | | | | | | | | | | | MonthGrid is not a full-blown CalendarView. It might come later. Change-Id: Ie8c6e1d2655769cd632edc376cbb5f068c1bd273 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>