summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Hein <[email protected]>2018-05-09 17:25:50 +0900
committerEike Hein <[email protected]>2018-05-11 17:51:00 +0900
commit28dc6b88538ebb9606db8678c40a2040d9d870f9 (patch)
tree00149b4a190b35478d97b989d4be676cef744e9a
parentc0cd1f8d49e6d63f1988d4749c366a0bef177790 (diff)
Always set applet title, even when label is disabled
Summary: Except when we're a containment. This way Folder View applets always have a nice tab title in the grouping applet. BUG:394007 Reviewers: #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D12775
-rw-r--r--containments/desktop/package/contents/ui/FolderViewLayer.qml30
1 files changed, 15 insertions, 15 deletions
diff --git a/containments/desktop/package/contents/ui/FolderViewLayer.qml b/containments/desktop/package/contents/ui/FolderViewLayer.qml
index 05024df..ba4dc1e 100644
--- a/containments/desktop/package/contents/ui/FolderViewLayer.qml
+++ b/containments/desktop/package/contents/ui/FolderViewLayer.qml
@@ -79,6 +79,21 @@ Item {
size: "16x16"
}
+ Binding {
+ target: plasmoid
+ property: "title"
+ value: labelGenerator.displayLabel
+ }
+
+ Folder.LabelGenerator {
+ id: labelGenerator
+
+ folderModel: folderView.model
+ rtl: (Qt.application.layoutDirection == Qt.RightToLeft)
+ labelMode: plasmoid.configuration.labelMode || (isContainment ? 0 : 1)
+ labelText: plasmoid.configuration.labelText
+ }
+
Folder.ViewPropertiesMenu {
id: viewPropertiesMenu
@@ -301,21 +316,6 @@ Item {
elide: Text.ElideMiddle
text: labelGenerator.displayLabel
font.underline: labelMouseArea.containsMouse
-
- Binding {
- target: plasmoid
- property: "title"
- value: labelGenerator.displayLabel
- }
-
- Folder.LabelGenerator {
- id: labelGenerator
-
- folderModel: folderView.model
- rtl: (Qt.application.layoutDirection == Qt.RightToLeft)
- labelMode: plasmoid.configuration.labelMode
- labelText: plasmoid.configuration.labelText
- }
}
MouseArea {