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

Use a StackView and non-dynamic instantation for the sidebar modes

Browse source 
Improves performance at the cost of flexibility.
But we did not use that flexibility anyway.
This commit is contained in:
Arjen Hiemstra 2016-01-25 02:43:43 +01:00
parent 8dc6353738
commit edf2802099
2 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

60
resources/qml/Sidebar.qml
View file

@ -82,6 +82,10 @@ Rectangle
onCurrentModeIndexChanged:
{
UM.Preferences.setValue("cura/active_mode", currentModeIndex);
if(modesListModel.count > base.currentModeIndex)
{
sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "replace": true });
}
}
Label {
@ -153,31 +157,40 @@ Rectangle
}
}
Loader
StackView
{
id: sidebarContents;
id: sidebarContents
anchors.bottom: footerSeparator.top
anchors.top: profileItem.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
anchors.left: base.left
anchors.right: base.right
source: modesListModel.count > base.currentModeIndex ? modesListModel.get(base.currentModeIndex).file : "";
property Item sidebar: base;
onLoaded:
delegate: StackViewDelegate
{
if(item)
function transitionFinished(properties)
{
item.configureSettings = base.configureMachinesAction;
if(item.onShowTooltip != undefined)
properties.exitItem.opacity = 1
}
pushTransition: StackViewTransition
{
PropertyAnimation
{
item.showTooltip.connect(base.showTooltip)
target: enterItem
property: "opacity"
from: 0
to: 1
duration: 100
}
if(item.onHideTooltip != undefined)
PropertyAnimation
{
item.hideTooltip.connect(base.hideTooltip)
target: exitItem
property: "opacity"
from: 1
to: 0
duration: 100
}
}
}
@ -210,10 +223,25 @@ Rectangle
id: modesListModel;
}
SidebarSimple
{
id: sidebarSimple;
visible: false;
}
SidebarAdvanced
{
id: sidebarAdvanced;
visible: false;
configureSettings: base.configureMachinesAction;
onShowTooltip: base.showTooltip(item, location, text)
onHideTooltip: base.hideTooltip()
}
Component.onCompleted:
{
modesListModel.append({ text: catalog.i18nc("@title:tab", "Simple"), file: "SidebarSimple.qml" })
modesListModel.append({ text: catalog.i18nc("@title:tab", "Advanced"), file: "SidebarAdvanced.qml" })
sidebarContents.setSource(modesListModel.get(base.currentModeIndex).file)
modesListModel.append({ text: catalog.i18nc("@title:tab", "Simple"), item: sidebarSimple })
modesListModel.append({ text: catalog.i18nc("@title:tab", "Advanced"), item: sidebarAdvanced })
sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "immediate": true });
}
}