aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-08-233-46/+69
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/material/qquickmaterialstyle.cpp src/imports/controls/universal/qquickuniversalstyle.cpp src/quicktemplates2/qquickpopup_p_p.h src/quicktemplates2/qquicktooltip.cpp tests/auto/auto.pro Change-Id: I88b347dd85278e14f7b2ca468e30648c6432b6f2
| * Material: document the attached style propertiesMitch Curtis2016-08-192-0/+15
| | | | | | | | | | Change-Id: I8349ec366c75b9480533bb9b61a3748e09e9560e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Material: ensure setting background/foreground worksMitch Curtis2016-08-191-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add hasGlobalForeground and hasGlobalBackground. These are set to true when a foreground/background color is specified via settings (qtquickcontrols2.conf file or environment variables), and then used to initialize each attached style object's m_hasForeground and m_hasBackground property. - Add tst_qquickmaterialstyleconf auto test to ensure that global settings are respected. Change-Id: I436773e355c6d470215fb9cfe8fbff402d2979d9 Task-number: QTBUG-55366 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Material: rename defaultX variables to globalXMitch Curtis2016-08-191-43/+43
| | | | | | | | | | | | | | | | | | For example, defaultPrimary will become globalPrimary. This better reflects the reality that these are not true defaults because they can be overridden by settings and makes it easier to read the code. Change-Id: Idf09e5b0c6a2d91663730c00e3d32f2be49e15c6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * ComboBox: make delegates respect the popup widthJ-P Nurmi2016-08-181-1/+1
| | | | | | | | | | | | Task-number: QTBUG-55050 Change-Id: I25e84d15ebb61f88cc92ab570471969ec5971c10 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-171-10/+12
|\| | | | | | | Change-Id: I8172f493c5747db2c9e728b026ff267bff2e3427
| * Material: fix multiple BusyIndicator instancesJ-P Nurmi2016-08-101-10/+12
| | | | | | | | | | | | | | | | | | | | Cannot use local static variables to store the values of the last round, because the values must be stored per instance, not shared between all busy indicators. Task-number: QTBUG-54472 Change-Id: Ibb088b077ff8e23b1376e04a0329f001211574f7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: fix qdoc warnings in the Material style internalsJ-P Nurmi2016-08-133-15/+15
| | | | | | | | | | | | | | | | Don't use qdoc syntax for the internals that are not supposed to be in the docs. Change-Id: I2abd61e50b89ed5c800364ce5732f85dda9d54b9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Material: restore ToolButton checked stateJ-P Nurmi2016-08-111-2/+3
| | | | | | | | | | | | Task-number: QTBUG-54917 Change-Id: Ib236d818fdc1582277e7a9fe367e9c92ff8648a1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add ComboBox::flatJ-P Nurmi2016-08-113-12/+18
| | | | | | | | | | | | | | | | | | [ChangeLog][ComboBox] Added a flat property that provides more suitable looks for using ComboBox in a ToolBar. Task-number: QTBUG-54935 Change-Id: Id458a078486aeac5d542a57f3ed247d63d25e95c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: fix ToolButton's inappropriately round hover effectMitch Curtis2016-08-101-1/+1
| | | | | | | | | | | | | | | | | | The Material style ToolButton's round hover effect was indecently exposing itself. It should only be visible when the text (i.e contentItem) is not very wide. Change-Id: Ie40b5cf02356a7b444187470e1c6e68252895140 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Restore version 2.0 for the .impl importsJ-P Nurmi2016-08-101-13/+14
| | | | | | | | | | | | | | | | | | | | | | It's a bit of extra hassle, but the type registration can be done so that we keep the old version available to avoid deliberately breaking apps that have had to import .impl to gain access to the internal goodies. For example, someone may have made a copy of one of the controls as our documentation suggests. :) Change-Id: I5308d7e74ecebf69da7fe9c6912380f72c3c9a2b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-08-091-0/+3
|\| | | | | | | | | | | | | Conflicts: src/imports/controls/material/ComboBox.qml Change-Id: Ie517a07a63cd74ce2d506a68ee24060dce977bf7
| * Material ComboBox: fix white text on white backgroundMitch Curtis2016-08-091-0/+3
| | | | | | | | | | | | Task-number: QTBUG-54935 Change-Id: I3be56bb67a7decf11434de64343f25af3a59bd1f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add MenuSeparatorMitch Curtis2016-07-252-0/+56
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls] Added MenuSeparator to visually distinguish between groups of items in a menu. Change-Id: I7a52910b19633ed1188c90ca56c92346a28d4d5c Task-number: QTBUG-54862 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | 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>
* | 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>
* | Add ToolSeparatorMitch Curtis2016-07-212-0/+60
| | | | | | | | | | | | | | | | | | | | 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>
* | 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-183-2/+96
| | | | | | | | | | | | | | | | | | | | [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>
* | Bump up IMPORT_VERSIONs in .pro filesJ-P Nurmi2016-07-151-1/+1
| | | | | | | | | | Change-Id: Icf62245d16d9f7c2b3652eec267115b41916149b Reviewed-by: Mitch Curtis <mitch.curtis@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>
* | 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>
* | 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>
* | 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>
* | Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-0846-116/+117
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Remove DialogButtonBox::flatJ-P Nurmi2016-06-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The Material Design allows mixing standard flat buttons with non-flat custom buttons. It is enough that the delegate provides flat standard buttons by default. It is better to not force all buttons to be flat, but let the user freely specify whether custom buttons are flat. This API has not yet been released, so it is still safe to remove. Change-Id: Iec400553ccefb47f20fb98d64919491d9bb27cbe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-06-296-7/+7
|\| | | | | | | Change-Id: Ifd118c11fd6034d03b98c961313280b7098c5f84
| * Material: fix radiusJ-P Nurmi2016-06-276-7/+7
| | | | | | | | | | | | | | | | There's barely any visual difference, but follow the Material Design specs that use 2dp corner radius. Change-Id: I9f1462eeb89c2462abb07a76949710d11881c4ce Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add hover support to TextArea & TextFieldJ-P Nurmi2016-06-292-2/+2
| | | | | | | | | | | | Task-number: QTBUG-50003 Change-Id: Ie101ba8840fba2a7503da8de77d9cf2a3c91d562 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 00:49:30 +0000