Dark mode theme improvements

Contributes to CL-1111
This commit is contained in:
Ian Paschal 2018-10-19 16:23:16 +02:00
parent 1ad008f45c
commit 817899686a
16 changed files with 137 additions and 90 deletions

View file

@ -8,8 +8,8 @@ import UM 1.2 as UM
Item {
property alias text: familyNameLabel.text;
property var padding: 3 * screenScaleFactor; // TODO: Theme!
implicitHeight: familyNameLabel.contentHeight + 2 * padding; // Apply the padding to top and bottom.
implicitWidth: familyNameLabel.contentWidth + implicitHeight; // The extra height is added to ensure the radius doesn't cut something off.
implicitHeight: familyNameLabel.contentHeight + 2 * padding; // Apply the padding to top and bottom.
implicitWidth: Math.max(48 * screenScaleFactor, familyNameLabel.contentWidth + implicitHeight); // The extra height is added to ensure the radius doesn't cut something off.
Rectangle {
id: background;
@ -17,7 +17,7 @@ Item {
horizontalCenter: parent.horizontalCenter;
right: parent.right;
}
color: UM.Theme.getColor("viewport_background"); // TODO: Theme!
color: familyNameLabel.text.length < 1 ? UM.Theme.getColor("monitor_skeleton_fill") : UM.Theme.getColor("monitor_pill_background");
height: parent.height;
radius: 0.5 * height;
width: parent.width;
@ -26,6 +26,7 @@ Item {
Label {
id: familyNameLabel;
anchors.centerIn: parent;
color: UM.Theme.getColor("text");
text: "";
}
}