1d88d67 · unity8 · git.iko.soy

git.iko.soy/unity8

Improve dash plugin mock

Make the clear button clear also clear the primary option selector selection

commit1d88d67deb2a31ae336dfefb77bd0596264ef342 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 17 Jun 2016, 01:12 (10 years ago) parent753da9f b4be48b

5 files changed+26

compare with xenial

unifiedsplit

tests/mocks/Unity/fake_optionselectorfilter.cpp+5 tests/mocks/Unity/fake_optionselectorfilter.h+2 tests/mocks/Unity/fake_optionselectoroptions.cpp+13 tests/mocks/Unity/fake_optionselectoroptions.h+2 tests/mocks/Unity/fake_scope.cpp+4

tests/mocks/Unity/fake_optionselectorfilter.cpp+5

@@ -63,3 +63,8 @@ bool FakeOptionSelectorFilter::isActive() const

6363{

6464 return m_options->anyChecked();

6565}

66+

67+void FakeOptionSelectorFilter::clear()

68+{

69+ m_options->clear();

70+}

tests/mocks/Unity/fake_optionselectorfilter.h+2

@@ -37,6 +37,8 @@ public:

3737

3838 bool isActive() const;

3939

40+ void clear();

41+

4042Q_SIGNALS:

4143 void isActiveChanged();

4244

tests/mocks/Unity/fake_optionselectoroptions.cpp+13

@@ -75,3 +75,16 @@ bool FakeOptionSelectorOptions::anyChecked() const

7575{

7676 return !m_checkedIndexes.isEmpty();

7777}

78+

79+void FakeOptionSelectorOptions::clear()

80+{

81+ if (!m_checkedIndexes.isEmpty()) {

82+ auto checkedIndexes = m_checkedIndexes;

83+ m_checkedIndexes.clear();

84+ Q_FOREACH(int row, checkedIndexes) {

85+ const QModelIndex idx = index(row, 0);

86+ Q_EMIT dataChanged(idx, idx, QVector<int>() << RoleOptionChecked);

87+ }

88+ Q_EMIT anyCheckedChanged();

89+ }

90+}

tests/mocks/Unity/fake_optionselectoroptions.h+2

@@ -36,6 +36,8 @@ public:

3636

3737 bool anyChecked() const;

3838

39+ void clear();

40+

3941Q_SIGNALS:

4042 void anyCheckedChanged();

4143

tests/mocks/Unity/fake_scope.cpp+4

@@ -342,6 +342,10 @@ int Scope::activeFiltersCount() const

342342

343343void Scope::resetPrimaryNavigationTag()

344344{

345+ if (m_hasPrimaryFilter && m_primaryNavigationFilter->isActive()) {

346+ m_primaryNavigationFilter->clear();

347+ }

348+

345349 if (m_currentNavigationId != "root") {

346350 setNavigationState("root");

347351 }