Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-06-14 08:15:45 +02:00
commit bd2b4a166b

View file

@ -235,7 +235,7 @@ public class MapWidgetRegistry {
public boolean isVisible(String key) { public boolean isVisible(String key) {
ApplicationMode mode = settings.APPLICATION_MODE.get(); ApplicationMode mode = settings.APPLICATION_MODE.get();
Set<String> elements = visibleElementsFromSettings.get(mode); Set<String> elements = visibleElementsFromSettings.get(mode);
return elements != null && elements.contains(key); return elements != null && (elements.contains(key) || elements.contains(COLLAPSED_PREFIX + key));
} }
public void setVisibility(MapWidgetRegInfo m, boolean visible, boolean collapsed) { public void setVisibility(MapWidgetRegInfo m, boolean visible, boolean collapsed) {