aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Material: determine the default hoverEnabled value from QStyleHintsJ-P Nurmi2016-07-2220-0/+40
| | | | | | Task-number: QTBUG-50003 Change-Id: I4809638c7ddaa4ca6fb99dbc734edb3641ecea05 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypes for templates and controlsJ-P Nurmi2016-07-223-431/+706
| | | | | | | | | | | | | | | | | | | | | For src/imports/templates, simply running 'make qmltypes' does the job. With src/imports/controls, we must help qmlplugindump a bit: - pass the correct dependencies in a JSON file (or else qmlimportscanner will find .impl imports, which qmlplugindump will fail to import as stand-alone modules) - merge with the plugins.qmltypes from templates to achieve proper type hierarchy The full command for dumping QtQuick.Controls 2.1 types, also seen at the top of src/imports/controls/plugins.qmltypes: qmlplugindump -nonrelocatable QtQuick.Controls 2.1 \ -merge ../templates/plugins.qmltypes \ -dependencies dependencies.json Change-Id: I2d8a24e47e70dd8dd27a2f48fe640faeea8761e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: fix ripple wave position on mouse ungrab / button cancelJ-P Nurmi2016-07-211-8/+2
| | | | | | | | | | | | | | | QQuickMaterialRipple compared the anchor item to QQuickWindow's mouseGrabberItem to ensure that only mouse-pressed buttons would use the press point, whereas key-pressed buttons would use the center point. However, this does not work in case the mouse grab was stolen: when first pressing an ItemDelegate and then dragging the containing ListView, the ripple wave would always appear from the center point, not from the press point as it should. Since QQuickAbstractButton::keyPressEvent() sets the press point as the center of the control, the mouseGrabberItem check can be simply removed. Change-Id: Ic24e5e80c9d849f3fe2684013dd40b004ef55b57 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: cleanup the ripple color bindingJ-P Nurmi2016-07-211-1/+1
| | | | | | | | The binding was copied from Button, and 'control.checked' condition was accidentally left there. Such property doesn't exist in ComboBox. Change-Id: I11b56e2da997ab2519a63527f58faff3d1bb4d8b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: rename ripple color propertiesJ-P Nurmi2016-07-2117-25/+25
| | | | | | | They are no longer specific to CheckBoxes, but used in most controls. Change-Id: I404aeab706479d0b666529ebdb09caa6b8085cae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: use the new .pro syntax for RESOURCESJ-P Nurmi2016-07-211-12/+3
| | | | | | | | A .qrc file is no longer mandatory. One can list resources directly in the RESOURCES variable. Change-Id: I172b6cfa0a16c3296794888bd2f40a4273739c32 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add ToolSeparatorMitch Curtis2016-07-2120-0/+465
| | | | | | | | | | ToolSeparator is used to visually distinguish between groups of items in a toolbar by separating them with a line. It can be used in horizontal or vertical toolbars. Task-number: QTBUG-54862 Change-Id: Ie68e680510428ad19e7f80268063af07b61100eb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickMaterialStyle: cleanup several unused colorsJ-P Nurmi2016-07-212-90/+5
| | | | | | | | | These are no longer used now that the hovered and focused states are visualized by the ripple background, and the pressed state by the ripple waves and the elevation shadow. Change-Id: Ia2d315c2d8b31e4fcd77534f6128584b9daeb8d8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: add missing ripple effect to SpinBox buttonsJ-P Nurmi2016-07-201-12/+24
| | | | | | Task-number: QTBUG-54764 Change-Id: Ie038161264c989853b2b6ec0bfceb09a1cd1195c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: add missing ripple effect to SwipeDelegateJ-P Nurmi2016-07-202-3/+18
| | | | | | Task-number: QTBUG-54764 Change-Id: Ie04c93a823745b6d0a85e0c80c91d4e7f77f6fcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: remove double press effect from delegatesJ-P Nurmi2016-07-206-7/+6
| | | | | | | | The press effect is visualized by the ripple background, so we don't need to adjust the control background color when pressed. Change-Id: Ic3acea4591d59f3045004b7e85a5b5bb9044c9f2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: revise Button visualsJ-P Nurmi2016-07-202-27/+15
| | | | | | | | | | | Pressed buttons were way too dark, and ripples weren't even visible for highlighted buttons. Now that we have ripples, we don't need to use so many different color shades to present various button states. Also, visualize the checked state with a little accented bar like the Android ToggleButton does. Change-Id: Id717b658bfe70ba211e4da5a6addc6e10a2df3e5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-202-5/+33
|\ | | | | | | Change-Id: Idf19dd882ba3015be2afda6988cac1e95a4912fa
| * ComboBox: add custom popup example snippetJ-P Nurmi2016-07-191-3/+30
| | | | | | | | | | Change-Id: I9e393d3db42ba21ee2e1cd231bb91fd55bcace46 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * differences.qdoc: clarify Button.qml exampleMitch Curtis2016-07-191-2/+3
| | | | | | | | | | | | | | | | import "controls" was supposed to refer to a directory named "controls". Change-Id: I6e977354fa1ce01b1c14dda378d077b1003cb21a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Material: improve Button's ripple effectJ-P Nurmi2016-07-191-2/+2
| | | | | | | | | | | | | | | | | | Trigger ripples on press for flat buttons, on release for raised buttons. Use highlighted (colored) ripple for highlighted (colored) buttons, not for checked (not colored) buttons. Change-Id: Ic7a6de070e568792d39cc20af35229517b7fd69e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: tweak ScrollBar looks and behaviorJ-P Nurmi2016-07-183-16/+33
| | | | | | | | | | | | | | | | | | | | Model the Material style scroll bar after the Chrome OS scroll bar. This adds a hover effect, and makes the transient timeout much longer to make the scroll bars easier to use on desktop. Task-number: QTBUG-50003 Change-Id: I5b1798e6c6b04482eab21d56e48935e2a9c69250 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add DialogJ-P Nurmi2016-07-1814-2/+371
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls] Added Dialog to provide convenience for handling dialog popups. Dialog integrates with DialogButtonBox, and provides convenient accepted() and rejected() signals. Task-number: QTBUG-51090 Change-Id: I776516738b82c0e5726769c054d6f2a956fb616d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Universal: add missing hover effect for ScrollBarJ-P Nurmi2016-07-181-1/+2
| | | | | | | | | | | | Task-number: QTBUG-50003 Change-Id: Ia17ac68adfda3babbc12b9c3484d8c9c74c736fb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump up IMPORT_VERSIONs in .pro filesJ-P Nurmi2016-07-154-4/+4
| | | | | | | | | | Change-Id: Icf62245d16d9f7c2b3652eec267115b41916149b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-151-0/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickswipedelegate.cpp tests/auto/controls/data/tst_swipedelegate.qml tests/auto/controls/data/tst_textarea.qml tests/auto/controls/data/tst_textfield.qml Change-Id: I244f4ead4d14238c41db0bd965d7a2938f2ea8fc
| * SwipeDelegate: document which items can be used in left/right/behindMitch Curtis2016-07-111-0/+5
| | | | | | | | | | | | Task-number: QTBUG-54658 Change-Id: Ie8bb1fa6669c7dd1cd18199d01c773a1854edad4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SwipeDelegate: add doc exampleMitch Curtis2016-07-151-0/+82
| | | | | | | | | | | | Change-Id: I3fb5434722dd5d6cd744e3d853a5a15e52bf03d0 Task-number: QTBUG-54645 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Material: make Dial use the internal SliderHandleJ-P Nurmi2016-07-141-3/+7
| | | | | | | | | | | | | | | | Gets the same ripple/hover effect for free. Task-number: QTBUG-54764 Change-Id: Ie741fa0c96293fde90c55b845d8ce5cccce3481f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: revert "trigger ripple effects on release" for MenuItemJ-P Nurmi2016-07-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | MenuItem looks very similar to ItemDelegate, so I unthoughtfully made both trigger ripples on release. However, Menus typically close when menu items are triggered, so triggering ripples on release means the ripples are never shown. For what it's worth, Android 6 also shows ripple effects on release for list items, and on press for menu items. Task-number: QTBUG-54764 Change-Id: I3bc362dbe4b890908ecb38a19edc804a5deb31e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SwipeDelegate: add swipe.pressed and swipe.clicked()Mitch Curtis2016-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | These allow users to detect when non-interactive left/right/behind items are being pressed and clicked. [ChangeLog][SwipeDelegate] Added swipe.pressed and swipe.clicked() for detecting when non-interactive left/right/behind items are pressed and clicked. Change-Id: I858f0a8e4f85b3f80f93eb4f1680d8e121acdd41 Task-number: QTBUG-54651 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Material: implement ripple effect for ComboBoxJ-P Nurmi2016-07-141-4/+6
| | | | | | | | | | | | Task-number: QTBUG-50003 Change-Id: I1346b1ae312eb182720b4fd9a89fb02f579be94b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: implement ripple effect for ToolButtonJ-P Nurmi2016-07-141-3/+14
| | | | | | | | | | | | Task-number: QTBUG-54764 Change-Id: I0f7a20db39ea02772482c9c0d8bea505c42a6944 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add an own copy of RectangularGlow, with OpenGL core and D3D12 as wellLaszlo Agocs2016-07-149-2/+312
| | | | | | | | | | Change-Id: I0231854ae93cb3f45ea5da13c30c08fdc1b29139 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SwipeDelegate: add swipe.close()Mitch Curtis2016-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This allows users to close the swipe after an action has been triggered, for example. [ChangeLog][SwipeDelegate] Added swipe.close() for setting swipe.position to 0. Change-Id: Ib12a6592ac1ba46baafd88a41ea8f297599c7bbc Task-number: QTBUG-54651 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Material: add ripple effect for TabButtonJ-P Nurmi2016-07-131-1/+9
| | | | | | | | | | Change-Id: I13ec210ecb8922ba9be4533df8771871cd862f66 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: trigger ripple effects on release for some controlsJ-P Nurmi2016-07-138-5/+36
| | | | | | | | | | | | | | | | | | | | Android 5 used to trigger ripple effects on press, but Android 6 made ripple effects a bit more subtle. For check boxes, radio buttons, and switches it still triggers on press, but these controls where the wave is larger, it's triggered on release instead. Change-Id: Ib4d301d5ccf72d5db106bcc6ad6afee30cef0b1e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Ripple: use timer event for RIPPLE_ENTER_DELAYJ-P Nurmi2016-07-132-4/+31
| | | | | | | | | | | | | | | | | | Instead of creating a ripple wave item right away and handling the delay inside the animation, use a timer event to postpone the wave creation until it's necessary. Change-Id: Ie8b6aa2e4ae148a51b0ae17f4d0ee50e20ddb321 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: fix ripple effect for RangeSliderJ-P Nurmi2016-07-113-1/+5
| | | | | | | | | | | | | | | | Only one handle should be hovered at a time. Task-number: QTBUG-50003 Change-Id: Id69325c651ef01a8da7ba6406fcf50f5b24a6959 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: implement ripple effect for SwitchDelegateJ-P Nurmi2016-07-113-12/+22
| | | | | | | | | | | | Task-number: QTBUG-50003 Change-Id: I33629bd06c125113408a7f5b11dea72821285876 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: implement ripple effect for RadioDelegateJ-P Nurmi2016-07-113-11/+25
| | | | | | | | | | | | Task-number: QTBUG-50003 Change-Id: Ic93ef1a7993e8a0fc352f5055924a9479a7c5ff8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: implement ripple effect for CheckDelegate & MenuItemJ-P Nurmi2016-07-114-13/+36
| | | | | | | | | | | | | | | | | | | | | | Move Ripple out of CheckIndicator to CheckBox's indicator, because for CheckDelegate and MenuItem it's in the background instead. This change adds ripple effect to CheckDelegate & MenuItem, which means that they now also have hover effects. Task-number: QTBUG-50003 Change-Id: Idb458d0e1e0e2985096532400f2e6d02e9afcf6c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: implement ripple effect for ItemDelegateJ-P Nurmi2016-07-111-2/+13
| | | | | | | | | | | | Task-number: QTBUG-50003 Change-Id: If480bffee0e6e6c2b688680365002ed58aacac5b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: implement ripple effect for ButtonJ-P Nurmi2016-07-111-0/+10
| | | | | | | | | | | | Task-number: QTBUG-50003 Change-Id: Icc96eba2bb01847c369dbc7d07144c453aa6b324 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickAbstractButton: make the press point available via private APIJ-P Nurmi2016-07-112-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | The Material style ripple effect needs it to be able to anchor waves at the press point. Export QQuickAbstractButtonPrivate to make it accessible, and update the press point before emitting pressedChanged() since that's what the ripple effect reacts to. Press point dependent ripple effects follow in separate commits. Change-Id: I63eb51eeabcbeb307dea9d0b1731bdb51b518ec7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Popup: expose flip APIJ-P Nurmi2016-07-091-0/+1
| | | | | | | | | | | | | | | | | | [ChangeLog][Popup] Added allowVerticalFlip and allowHorizontalFlip properties to control whether flipping is allowed to fit a popup inside the window. Change-Id: Id14a8846a1e2d07e98207da7c2b2765c202dbaf9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devJ-P Nurmi2016-07-092-1/+26
|\ \
| * | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-092-1/+26
| |\| | | | | | | | | | Change-Id: Ifff470774347041d1638fb1da277a8cc11a00db6
| | * Doc: missing signals in MonthGridJ-P Nurmi2016-07-081-0/+24
| | | | | | | | | | | | | | | Change-Id: I1efa6da9ededb87d9629a0f7b1ea53487e4a6bcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: fix custom PageIndicator snippetJ-P Nurmi2016-07-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use an explicit ID to reference PageIndicator::currentIndex. It happens to work without an ID when PageIndicator is in its own file, but not when customized inline in a tree of other objects. Change-Id: I3e6a6e63373b44771737271479c044fdcc0a470a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Material: implement the ripple effectJ-P Nurmi2016-07-099-76/+532
|/ / | | | | | | | | | | | | | | | | | | | | Consequently, the controls that were previously using the old Ripple type have now gained hover effects (when hoverEnabled: true). The rest of the Material style controls will be adjusted to use the ripple effect in follow up commits. Task-number: QTBUG-50003 Change-Id: I436f3794411fe75de9ccbe3ecda71029130db613 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | qtquickcontrols2plugin.cpp: remove useless double registrationJ-P Nurmi2016-07-081-8/+0
| | | | | | | | | | | | | | | | | | This does not even seem to affect the availability of new properties. It is enough that the types internally import QtQuick.Templates 2.1, which was done in the previous commit. Change-Id: I4b1bce7dc503cc257e3d6483bac4c05b8421995f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-08222-387/+388
| | | | | | | | | | | | | | | | | | | | | | | | Controls must import templates version 2.1 in order to "inherit" 1-revisioned properties, methods, and signals. So far, this has been done case by case, but it's less error prone and more clear to change them all. For example, if you ever see a source file pasted/linked somewhere, it's easy to identify the version it belongs to. Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix Tumbler GIFMitch Curtis2016-07-011-0/+0
| | | | | | | | | | | | | | It was too big and had visual artefacts. Change-Id: I650f50f4758891feb39cdbd07b72ef2180e4edb9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Tumbler: make wrap property depend on count by defaultMitch Curtis2016-07-011-1/+0
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Behavior Changes][Tumbler] Changed the default value of wrap to be false when count is less than visibleItemCount. Explicitly setting wrap overrides this behavior. Change-Id: I0089f517a25a606625c245df52b0db5fd859ffc0 Task-number: QTBUG-53587 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 10:57:07 +0000