Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@nextcloud.com>2020-09-24 15:51:48 +0300
committerGitHub <noreply@github.com>2020-09-24 15:51:48 +0300
commit068ad89d8d1a7133f9f645b07fbc21fc619726f2 (patch)
treee33b9650c9e92f56788ca32748326bd500bf6988
parent17b991bda3211c090dba8d482a4632ff1747c85f (diff)
parentdf6abcb68d5b904504dac3483d7bb9d9b5fb3de3 (diff)
Merge pull request #2471 from nextcloud/backport/2470/stable-3.0v3.0.2
[stable-3.0] Force tooltip wrap mode because it's not enabled in Qt 5.12...
-rw-r--r--src/gui/tray/Window.qml8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 5d87ca76e..0ac120e16 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -539,10 +539,18 @@ Window {
}
ToolTip {
+ id: toolTip
visible: activityMouseArea.containsMouse
text: activityTextTitle.text + ((activityTextInfo.text !== "") ? "\n\n" + activityTextInfo.text : "")
delay: 250
timeout: 10000
+ // Can be dropped on more recent Qt, but on 5.12 it doesn't wrap...
+ contentItem: Text {
+ text: toolTip.text
+ font: toolTip.font
+ wrapMode: Text.Wrap
+ color: toolTip.palette.toolTipText
+ }
}
}
Button {