3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add tab style to tabbed content

Browse source 
It now gets a proper background colour, lining and radius.

Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-11-26 15:47:32 +01:00
parent 90a73f351d
commit ac5f79ba2c
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

35
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.0
import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Controls 1.1 as OldControls
@ -33,7 +33,7 @@ Item
{
id: tabBar
anchors.top: header.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height + header.height
anchors.topMargin: UM.Theme.getSize("default_margin").height
onCurrentIndexChanged: Cura.ExtruderManager.setActiveExtruderIndex(currentIndex)
@ -57,17 +57,46 @@ Item
}
}
Item
Rectangle
{
id: tabControl
width: parent.width
height: childrenRect.height
anchors.top: tabBar.bottom
radius: UM.Theme.getSize("default_radius").width
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining")
color: UM.Theme.getColor("secondary")
//Remove rounding and lining at the top.
Rectangle
{
width: parent.width
height: parent.radius
anchors.top: parent.top
color: UM.Theme.getColor("lining")
Rectangle
{
anchors
{
left: parent.left
leftMargin: parent.parent.border.width
right: parent.right
rightMargin: parent.parent.border.width
top: parent.top
}
height: parent.parent.radius
color: parent.parent.color
}
}
property var model: extrudersModel.items[tabBar.currentIndex]
property real textWidth: Math.round(width * 0.3)
property real controlWidth: width - textWidth
Column
{
padding: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").height
Row