GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 20:19:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header

Browse Source
This commit is contained in:
Jaime van Kessel 2018-10-12 13:26:53 +02:00
commit 6ea03d27a4
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/qml/Cura.qml
View File

@ -34,14 +34,18 @@ UM.MainWindow
{
// If slidebar is collapsed then it should be invisible
// otherwise after the main_window resize the sidebar will be fully re-drawn
if (sidebar.collapsed){
if (sidebar.visible == true){
if (sidebar.collapsed)
{
if (sidebar.visible == true)
{
sidebar.visible = false
sidebar.initialWidth = 0
}
}
else{
if (sidebar.visible == false){
else
{
if (sidebar.visible == false)
{
sidebar.visible = true
sidebar.initialWidth = UM.Theme.getSize("sidebar").width
}

14
resources/qml/Skeleton/ApplicationViews.qml
View File

@ -11,9 +11,9 @@ import Cura 1.0 as Cura
import "../components"
// This item contains the views selector, a combobox that is dinamically created from
// the list of available Views (packages that create different visualizactions of the
// scene. Aside the selector, there is a row of buttons that change the orientation of the view.
// This item contains the views selector, a combobox that is dynamically created from
// the list of available Views (packages that create different visualizations of the
// scene). Aside from the selector, there is a row of buttons that change the orientation of the view.
Item
{
id: applicationViewsSelector
@ -25,7 +25,8 @@ Item
{
id: viewModeButton
anchors {
anchors
{
verticalCenter: parent.verticalCenter
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
@ -51,8 +52,9 @@ Item
{
for (var i = 0; i < model.rowCount(); i++)
{
if (model.getItem(i).active) {
return i
if (model.getItem(i).active)
{
return i;
}
}
return 0