diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-04 13:35:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-04 13:35:55 +0200 |
| commit | 5211cf2843af606b912e9130d44ee6c82eeb40b0 (patch) | |
| tree | d2a90e480d497edc3bbac367bf974ec93076e409 /src/imports/controls/material | |
| parent | 13bdd61c6597586f62558ca337c193ce03db26cc (diff) | |
| parent | ce7c431fb23157fa5125d1102a594de045818a72 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: I0bc187e2a8edb4e357c1bf114dd9b1977d5c1e45
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/Button.qml | 3 | ||||
| -rw-r--r-- | src/imports/controls/material/CursorDelegate.qml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 6f7d6c70..04c6664c 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -78,7 +78,6 @@ T.Button { control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.foreground } - // TODO: Add a proper ripple/ink effect for mouse/touch input and focus state background: Rectangle { implicitWidth: 64 implicitHeight: control.Material.buttonHeight @@ -113,7 +112,7 @@ T.Button { pressed: control.pressed anchor: control active: control.down || control.visualFocus || control.hovered - color: control.Material.rippleColor + color: control.flat && control.highlighted ? control.Material.highlightedRippleColor : control.Material.rippleColor } } } diff --git a/src/imports/controls/material/CursorDelegate.qml b/src/imports/controls/material/CursorDelegate.qml index f472e8ae..1626a6fb 100644 --- a/src/imports/controls/material/CursorDelegate.qml +++ b/src/imports/controls/material/CursorDelegate.qml @@ -55,7 +55,7 @@ Rectangle { Timer { id: timer - running: cursor.parent.activeFocus && !cursor.parent.readOnly + running: cursor.parent.activeFocus && !cursor.parent.readOnly && interval != 0 repeat: true interval: Qt.styleHints.cursorFlashTime / 2 onTriggered: cursor.opacity = !cursor.opacity ? 1 : 0 |