3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

addapts the sizes of primarily the buttons

Browse source 
fixes: issue CURA-194
This commit is contained in:
Tamara Hogenhout 2015-09-21 14:14:28 +02:00
parent c7efde275a
commit c352c6f369
3 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Cura.qml
View file

@ -413,7 +413,7 @@ UM.MainWindow
anchors {
left: parent.left
top: parent.top
topMargin: 74
topMargin: UM.Theme.sizes.default_margin.height + UM.Theme.sizes.button.height
//horizontalCenter: parent.horizontalCenter
//horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2)
//top: parent.top;

10
resources/themes/cura/styles.qml
View file

@ -57,11 +57,11 @@ QtObject {
ButtonStyle {
background: Item{
implicitWidth: UM.Theme.sizes.button.width;
implicitHeight: UM.Theme.sizes.button.width;
implicitHeight: UM.Theme.sizes.button.height;
Rectangle {
anchors.left: parent.right
anchors.verticalCenter: parent.verticalCenter
color: "white"
color: UM.Theme.colors.button_text
width: control.hovered ? openFileLabel.width : 0;
height: openFileLabel.height
Behavior on width { NumberAnimation { duration: 100; } }
@ -87,7 +87,7 @@ QtObject {
source: control.iconSource;
width: UM.Theme.sizes.button_icon.width;
height: UM.Theme.sizes.button_icon.height;
sourceSize: UM.Theme.sizes.button_icon;
sourceSize: UM.Theme.sizes.button_icon
}
}
}
@ -178,7 +178,7 @@ QtObject {
width: UM.Theme.sizes.button_icon.width;
height: UM.Theme.sizes.button_icon.height;
sourceSize: UM.Theme.sizes.button_icon;
sourceSize: UM.Theme.sizes.button_icon
}
}
}
@ -243,7 +243,7 @@ QtObject {
width: UM.Theme.sizes.button_icon.width;
height: UM.Theme.sizes.button_icon.height;
sourceSize: UM.Theme.sizes.button_icon;
sourceSize: UM.Theme.sizes.button_icon
}
}
}

9
resources/themes/cura/theme.json
View file

@ -151,11 +151,6 @@
"default_margin": [1.0, 1.0],
"default_lining": [0.1, 0.1],
"logo": [9.5, 2.0],
"toolbar_button": [2.0, 2.0],
"toolbar_spacing": [1.0, 1.0],
"loadfile_button": [11.0, 2.4],
"loadfile_margin": [0.8, 0.4],
"sidebar": [26.0, 10.0],
"sidebar_header": [0.0, 3.2],
@ -179,8 +174,8 @@
"standard_list_input": [20.0, 25.0],
"standard_arrow": [0.6, 0.6],
"button": [3.2, 3.2],
"button_icon": [2.5, 2.5],
"button": [3.8, 3.8],
"button_icon": [2.6, 2.6],
"progressbar": [26.0, 0.8],
"progressbar_control": [8.0, 0.8],