diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-11 10:57:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-11 10:57:50 +0200 |
| commit | d41f0bed7ddbdacb4f6444a84773a029e46988f3 (patch) | |
| tree | 15a68979470278f0c13b2521cb614d5670288271 /src/webengine/ui | |
| parent | 0caabd54a24ffa3a2d2de5cb6f1fce2af3588eb7 (diff) | |
| parent | a2c365cb1f22431845380159c29048da76c2b2a9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty
Change-Id: I64b46801bbaac4e96e32fece30f24f1d6cfc97a4
Diffstat (limited to 'src/webengine/ui')
| -rw-r--r-- | src/webengine/ui/ToolTip.qml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/webengine/ui/ToolTip.qml b/src/webengine/ui/ToolTip.qml index 96033e8f1..2bfe9eaf5 100644 --- a/src/webengine/ui/ToolTip.qml +++ b/src/webengine/ui/ToolTip.qml @@ -47,8 +47,9 @@ Item { visible: false property alias text: toolTip.text - property int delayTimerInterval: 1000 - property int hideTimerInterval: 1500 + property int delayTimerInterval: 500 + property int hideTimerInterval: 10000 + property int toolTipMaxWidth: 400 Timer { id: delayTimer @@ -77,7 +78,8 @@ Item { Text { id: toolTip anchors {fill: parent; margins: 5} - wrapMode: Text.WrapAnywhere + wrapMode: Text.Wrap + width: Math.min(toolTipMaxWidth, (toolTip.text.length +1) * 8) } } |