Merge remote-tracking branch 'origin/master' into refactoring_machine_manager

This commit is contained in:
Lipu Fei 2018-03-02 09:55:14 +01:00
commit 93190dde9b
8 changed files with 189 additions and 190 deletions

View file

@ -477,6 +477,14 @@ UM.MainWindow
collapseSidebarAnimation.start();
}
}
MouseArea
{
visible: UM.Controller.activeStage.sidebarComponent != ""
anchors.fill: parent
acceptedButtons: Qt.AllButtons
onWheel: wheel.accepted = true
}
}
UM.MessageStack