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

@ -142,7 +142,7 @@ Item
TextField
{
id: filter;
height: parent.height
anchors.left: parent.left
anchors.right: clearFilterButton.left
anchors.rightMargin: Math.round(UM.Theme.getSize("sidebar_margin").width)