Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2019-04-03 18:03:39 +0300
committerJaime van Kessel <nallath@gmail.com>2019-04-03 18:03:39 +0300
commit362036e06420a50f939a102975a9e1cd684a7fdd (patch)
tree16312ef30261f3978e95b3a0926e179b08a7e16f /plugins/MachineSettingsAction
parentcf04ee98ef403674815d393e488c2acf6692ea26 (diff)
Fix small display issue where a line was drawn between the tabs
CURA-6057
Diffstat (limited to 'plugins/MachineSettingsAction')
-rw-r--r--plugins/MachineSettingsAction/MachineSettingsAction.qml51
1 files changed, 26 insertions, 25 deletions
diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index 1521c38eaa..a1540c22ab 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -17,7 +17,6 @@ Cura.MachineAction
UM.I18nCatalog { id: catalog; name: "cura" }
anchors.fill: parent
- anchors.margins: UM.Theme.getSize("default_margin").width
property var extrudersModel: Cura.ExtrudersModel {}
@@ -49,37 +48,26 @@ Cura.MachineAction
}
}
- Rectangle
+ Cura.RoundedRectangle
{
- anchors.fill: parent
- border.color: tabBar.visible ? UM.Theme.getColor("lining") : "transparent"
- border.width: UM.Theme.getSize("default_lining").width
- radius: UM.Theme.getSize("default_radius").width
-
- UM.TabRow
+ anchors
{
- id: tabBar
- width: parent.width
-
- Repeater
- {
- model: tabNameModel
- delegate: Cura.TabButton
- {
- text: model.name
- }
- }
+ 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
+ radius: UM.Theme.getSize("default_radius").width
+ color: UM.Theme.getColor("main_background")
StackLayout
{
id: tabStack
- anchors.top: tabBar.bottom
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.bottom: parent.bottom
+ anchors.fill: parent
- width: parent.width
currentIndex: tabBar.currentIndex
MachineSettingsPrinterTab
@@ -99,4 +87,17 @@ Cura.MachineAction
}
}
}
+ UM.TabRow
+ {
+ id: tabBar
+ width: parent.width
+ Repeater
+ {
+ model: tabNameModel
+ delegate: UM.TabRowButton
+ {
+ text: model.name
+ }
+ }
+ }
}