3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 04:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix small display issue where a line was drawn between the tabs

Browse source 
CURA-6057
This commit is contained in:
Jaime van Kessel 2019-04-03 17:03:39 +02:00
parent cf04ee98ef
commit 362036e064
2 changed files with 26 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

51
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -17,7 +17,6 @@ Cura.MachineAction
UM.I18nCatalog { id: catalog; name: "cura" } UM.I18nCatalog { id: catalog; name: "cura" }
anchors.fill: parent anchors.fill: parent
anchors.margins: UM.Theme.getSize("default_margin").width
property var extrudersModel: Cura.ExtrudersModel {} property var extrudersModel: Cura.ExtrudersModel {}
@ -49,37 +48,26 @@ Cura.MachineAction
} }
} }
Rectangle Cura.RoundedRectangle
{ {
anchors.fill: parent anchors
border.color: tabBar.visible ? UM.Theme.getColor("lining") : "transparent" {
top: tabBar.bottom
topMargin: -UM.Theme.getSize("default_lining").height
bottom: parent.bottom
left: parent.left
right: parent.right
}
cornerSide: Cura.RoundedRectangle.Direction.Down
border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
radius: UM.Theme.getSize("default_radius").width radius: UM.Theme.getSize("default_radius").width
color: UM.Theme.getColor("main_background")
UM.TabRow
{
id: tabBar
width: parent.width
Repeater
{
model: tabNameModel
delegate: Cura.TabButton
{
text: model.name
}
}
}
StackLayout StackLayout
{ {
id: tabStack id: tabStack
anchors.top: tabBar.bottom anchors.fill: parent
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
width: parent.width
currentIndex: tabBar.currentIndex currentIndex: tabBar.currentIndex
MachineSettingsPrinterTab MachineSettingsPrinterTab
@ -99,4 +87,17 @@ Cura.MachineAction
} }
} }
} }
UM.TabRow
{
id: tabBar
width: parent.width
Repeater
{
model: tabNameModel
delegate: UM.TabRowButton
{
text: model.name
}
}
}
} }

28
resources/qml/Widgets/TabButton.qml
View file

@ -1,28 +0,0 @@
// Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick.Controls 2.3
import UM 1.3 as UM
import Cura 1.1 as Cura
//
// This is the default Cura Tab button which is a plaintext label.
//
UM.TabRowButton
{
id: tabButton
text: model.name
contentItem: Label
{
anchors.centerIn: tabButton
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: tabButton.text
font: tabButton.checked ? UM.Theme.getFont("medium_bold") : UM.Theme.getFont("medium")
renderType: Text.NativeRendering
}
}