mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2
This commit is contained in:
commit
f682f56923
371 changed files with 41465 additions and 33048 deletions
|
|
@ -38,7 +38,7 @@ ToolTip
|
|||
onAboutToHide: hide()
|
||||
|
||||
// If the text is not set, just set the height to 0 to prevent it from showing
|
||||
height: text != "" ? label.contentHeight + 2 * UM.Theme.getSize("thin_margin").width: 0
|
||||
height: label.contentHeight + 2 * UM.Theme.getSize("thin_margin").width
|
||||
|
||||
x:
|
||||
{
|
||||
|
|
@ -73,7 +73,7 @@ ToolTip
|
|||
}
|
||||
|
||||
function show() {
|
||||
opacity = 1
|
||||
opacity = text != "" ? 1 : 0
|
||||
}
|
||||
|
||||
function hide() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue