3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Hide icons if top bar buttons have no icon

Browse source 
Otherwise there's some empty space there and the RecolourImage will colour that space white.

Contributes to issue CURA-4213.
This commit is contained in:
Ghostkeeper 2017-08-31 17:24:12 +02:00
parent bec786b140
commit d13b693da0
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/themes/cura/styles.qml
View file

@ -156,22 +156,23 @@ QtObject {
height: Theme.getSize("button_icon").height
UM.RecolorImage
{
visible: control.iconSource != ""
id: icon
color: UM.Theme.getColor("text_reversed")
opacity: !control.enabled ? 0.2 : 1.0
source: control.iconSource
width: Theme.getSize("button_icon").width
width: visible ? Theme.getSize("button_icon").width : 0
height: Theme.getSize("button_icon").height
sourceSize: Theme.getSize("button_icon")
}
UM.RecolorImage
{
visible: control.overlayIconSource != ""
visible: control.overlayIconSource != "" && control.iconSource != ""
color: control.overlayColor
opacity: !control.enabled ? 0.2 : 1.0
source: control.overlayIconSource
width: Theme.getSize("button_icon").width
width: visible ? Theme.getSize("button_icon").width : 0
height: Theme.getSize("button_icon").height
sourceSize: Theme.getSize("button_icon")
@ -180,7 +181,7 @@ QtObject {
{
text: control.text;
anchors.left: icon.right
anchors.leftMargin: Theme.getSize("default_margin").width
anchors.leftMargin: icon.visible ? Theme.getSize("default_margin").width : 0
anchors.verticalCenter: parent.verticalCenter;
font: UM.Theme.getFont("large");
color: UM.Theme.getColor("text_reversed")