T562: Text box expanded and all settings visible while filtering

# Conflicts:
#	resources/qml/Settings/SettingView.qml
This commit is contained in:
Victor Larchenko 2016-11-14 13:36:07 +06:00 committed by fieldOfView
parent e450d10ddb
commit b63f4e0bee

View File

@ -27,7 +27,8 @@ Item
top: parent.top
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
//right: parent.right
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
}
placeholderText: catalog.i18nc("@label:textbox", "Filter...")
@ -57,12 +58,14 @@ Item
{
expandedCategories = definitionsModel.expanded.slice();
definitionsModel.expanded = ["*"];
definitionsModel.showAncestors = true
definitionsModel.showAncestors = true;
definitionsModel.showAll = true;
}
else
{
definitionsModel.expanded = expandedCategories;
definitionsModel.showAncestors = false
definitionsModel.showAncestors = false;
definitionsModel.showAll = false;
}
lastFilterEmpty = _filterEmpty;
}