Commit 78eccc8b authored by Nate Graham's avatar Nate Graham 💤
Browse files

[Folder View] Fix text label color in pop-up

Summary:
Currently there's a top-level ColorScope that is almost entirely unused except for
introducing a bug whereby the label text in the pop-up is the wrong color. Removing the
ColorScope fixes the bug and does not change the appearance of anything else anywhere else.

BUG: 416658
FIXED-IN: 5.18.0

Test Plan:
Hover over a folder and click on button to open a folder pop-up
See that the text color is correct now: {F7925905, size=full}

Use Folder view as a containment, as a widget, and in a panel
See that text color is fine everywhere

Use a bunch of different color schemes and repeat the above tests and see that everything
still looks good

Reviewers: #vdg, #plasma, hein, davidedmundson, mart

Reviewed By: #vdg, #plasma, mart

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D26884
parent 3d5719e7
......@@ -225,8 +225,8 @@ FocusScope {
}
}
PlasmaCore.ColorScope {
id: colorScope
FolderView {
id: folderView
anchors.left: parent.left
anchors.top: parent.top
......@@ -234,39 +234,29 @@ FocusScope {
anchors.right: parent.right
anchors.bottom: parent.bottom
// If containment always complementary, otherwise inherit (usually normal).
colorGroup: (root.isContainment ? PlasmaCore.Theme.ComplementaryColorGroup
: PlasmaCore.ColorScope.colorGroup)
focus: true
isRootView: true
FolderView {
id: folderView
url: plasmoid.configuration.url
locked: (plasmoid.configuration.locked || !isContainment || lockedByKiosk)
filterMode: plasmoid.configuration.filterMode
filterPattern: plasmoid.configuration.filterPattern
filterMimeTypes: plasmoid.configuration.filterMimeTypes
anchors.fill: parent
flow: (plasmoid.configuration.arrangement === 0) ? GridView.FlowLeftToRight : GridView.FlowTopToBottom
layoutDirection: (plasmoid.configuration.alignment === 0) ? Qt.LeftToRight : Qt.RightToLeft
focus: true
isRootView: true
url: plasmoid.configuration.url
locked: (plasmoid.configuration.locked || !isContainment || lockedByKiosk)
filterMode: plasmoid.configuration.filterMode
filterPattern: plasmoid.configuration.filterPattern
filterMimeTypes: plasmoid.configuration.filterMimeTypes
flow: (plasmoid.configuration.arrangement === 0) ? GridView.FlowLeftToRight : GridView.FlowTopToBottom
layoutDirection: (plasmoid.configuration.alignment === 0) ? Qt.LeftToRight : Qt.RightToLeft
onSortModeChanged: {
plasmoid.configuration.sortMode = sortMode;
}
onSortModeChanged: {
plasmoid.configuration.sortMode = sortMode;
}
onPositionsChanged: {
plasmoid.configuration.positions = folderView.positions;
}
onPositionsChanged: {
plasmoid.configuration.positions = folderView.positions;
}
Component.onCompleted: {
folderView.sortMode = plasmoid.configuration.sortMode;
folderView.positions = plasmoid.configuration.positions;
}
Component.onCompleted: {
folderView.sortMode = plasmoid.configuration.sortMode;
folderView.positions = plasmoid.configuration.positions;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment