3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-24 11:21:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-20 16:02:19 +01:00
commit 7e176e0f2c
7 changed files with 38 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View file

@ -146,10 +146,9 @@ ScrollView
font: UM.Theme.getFont("default")
visible: base.currentSection == section
background: Rectangle
background: Item
{
anchors.fill: parent
color: "transparent"
}
indicator: Rectangle

2
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View file

@ -61,7 +61,7 @@ Item
property int maxItemCountAtOnce: 8 // show at max 8 items at once, otherwise you need to scroll.
height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
visible: networkPrinterListView.model.length > 0
visible: networkPrinterListView.count > 0
clip: true