c20e7ed · unity8 · git.iko.soy

qml/Dash/Filters/FilterOptionSelector.qml+1

compare with xenial

unifiedsplit

@@ -30,6 +30,7 @@ FilterWidget {

30

31 expandedHeight: collapsedHeight + column.height

32 width: parent.width

33+ showDivider: false

33

34

34 onClicked: {

35 onClicked: {

35 expanded = !expanded;

36 expanded = !expanded;

qml/Dash/FiltersPopover.qml+7

@@ -17,6 +17,7 @@

17import QtQuick 2.4

18import Ubuntu.Components 1.3

19import Ubuntu.Components.Popups 1.3

20+import Ubuntu.Components.ListItems 1.3 as ListItems

20import "Filters" as Filters

21import "Filters" as Filters

21

22

22Popover {

23Popover {

@@ -77,6 +78,7 @@ Popover {

77 }

78 }

78

79

79 Repeater {

80 Repeater {

81+ id: repeater

80 model: scopeView.scope.filters

82 model: scopeView.scope.filters

81

83

82 delegate: Filters.FilterWidgetFactory {

84 delegate: Filters.FilterWidgetFactory {

@@ -85,6 +87,11 @@ Popover {

85 widgetId: id

87 widgetId: id

86 widgetType: type

88 widgetType: type

87 widgetData: filter

89 widgetData: filter

90+

91+ ListItems.ThinDivider {

92+ anchors.bottom: parent.bottom

93+ visible: index != repeater.count - 1

94+ }

88 }

95 }

89 }

96 }

90 }

97 }

tests/mocks/Unity/fake_filters.cpp+2−1

@@ -25,7 +25,6 @@ Filters::Filters(Scope* parent)

25 : unity::shell::scopes::FiltersInterface(parent)

26{

27 addFilter(new FakeOptionSelectorFilter("OSF1", "Tag1", "Which Cake you like More", false, QStringList() << "cheese" << "carrot" << "chocolate", this));

28− addFilter(new FakeOptionSelectorFilter("OSF2", "Tag2", "Which Countries have you been to?", true, QStringList() << "Germany" << "UK" << "New Zealand", this));

29

28

30 FakeRangeInputFilter *rif = new FakeRangeInputFilter("RIF1", "Tag3", this);

29 FakeRangeInputFilter *rif = new FakeRangeInputFilter("RIF1", "Tag3", this);

31 rif->setTitle("How much do you want to walk?");

30 rif->setTitle("How much do you want to walk?");

@@ -40,6 +39,8 @@ Filters::Filters(Scope* parent)

40 labels[100] = "100";

39 labels[100] = "100";

41 FakeValueSliderFilter *vsf = new FakeValueSliderFilter("VS1", "Tag4", 15, 10, 150, labels, this);

40 FakeValueSliderFilter *vsf = new FakeValueSliderFilter("VS1", "Tag4", 15, 10, 150, labels, this);

42 addFilter(vsf);

41 addFilter(vsf);

42+

43+ addFilter(new FakeOptionSelectorFilter("OSF2", "Tag2", "Which Countries have you been to?", true, QStringList() << "Germany" << "UK" << "New Zealand", this));

43}

44}

44

45

45void Filters::addFilter(unity::shell::scopes::FilterBaseInterface *f)

46void Filters::addFilter(unity::shell::scopes::FilterBaseInterface *f)