GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-13 06:13:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix view combobox not updating when using view menu item, code cleanup, CURA-4411

Browse Source
This commit is contained in:
ChrisTerBeke 2017-10-05 15:01:19 +02:00
parent cd59048475
commit 9ef1caff50
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
resources/qml/Topbar.qml
View File

@ -221,40 +221,51 @@ Rectangle
ComboBox ComboBox
{ {
id: viewModeButton id: viewModeButton
anchors
{ anchors {
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("sidebar").width + UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("sidebar").width + UM.Theme.getSize("default_margin").width
} }
style: UM.Theme.styles.combobox style: UM.Theme.styles.combobox
visible: !base.monitoringPrint visible: !base.monitoringPrint
model: UM.ViewModel { } model: UM.ViewModel { }
textRole: "name" textRole: "name"
onCurrentIndexChanged: // update the model's active index
{ function update () {
UM.Controller.setActiveView(model.getItem(currentIndex).id); currentIndex = getActiveIndex()
for (var i = 0; i < model.rowCount(); i++) {
// Update the active flag model.getItem(i).active = (i == currentIndex)
for (var i = 0; i < model.rowCount; ++i)
{
const is_active = i == currentIndex;
model.getItem(i).active = is_active;
} }
} }
currentIndex: // get the index of the active model item on start
{ function getActiveIndex () {
for (var i = 0; i < model.rowCount; ++i) for (var i = 0; i < model.rowCount(); i++) {
{ if (model.getItem(i).active) {
if (model.getItem(i).active) return i
{
return i;
} }
} }
return 0; return 0
}
// set the active index
function setActiveIndex (index) {
UM.Controller.setActiveView(index)
// the connection to UM.ActiveView will trigger update so there is no reason to call it manually here
}
onCurrentIndexChanged: viewModeButton.setActiveIndex(model.getItem(currentIndex).id)
currentIndex: getActiveIndex()
// watch the active view proxy for changes made from the menu item
Connections
{
target: UM.ActiveView
onActiveViewChanged: viewModeButton.update()
} }
} }