git.iko.soy/unity8
on xenial help sign in
No alt root and 2nd level navigation for middle4
07d6ec2Albert Astals Cid
tests/mocks/Unity/fake_navigation.cpp+6−4
compare with xenial
unifiedsplit
@@ -77,17 +77,17 @@ int Navigation::count() const
77
77
78bool Navigation::isRoot() const
78bool Navigation::isRoot() const
79{
79{
80− return m_navigationId == "root" || m_navigationId == "altroot";
80+ return m_navigationId == "root";
81}
81}
82
82
83bool Navigation::hidden() const
83bool Navigation::hidden() const
84{
84{
85− return m_navigationId == "altroot";
85+ return false;
86}
86}
87
87
88int Navigation::rowCount(const QModelIndex & /*parent*/) const
88int Navigation::rowCount(const QModelIndex & /*parent*/) const
89{
89{
90− if (!m_loaded || m_navigationId.startsWith("child") || m_navigationId.startsWith("altrootChild") || m_navigationId == "middle3")
90+ if (!m_loaded ||(m_navigationId.startsWith("child") && !m_navigationId.startsWith("childmiddle4")) || m_navigationId == "middle3")
91 return 0;
91 return 0;
92 else
92 else
93 return 8;
93 return 8;
@@ -101,10 +101,12 @@ QVariant Navigation::data(const QModelIndex &index, int role) const
101 return QString("middle%1").arg(index.row());
101 return QString("middle%1").arg(index.row());
102 else if (m_navigationId.startsWith("middle"))
102 else if (m_navigationId.startsWith("middle"))
103 return QString("child%1%2").arg(m_navigationId).arg(index.row());
103 return QString("child%1%2").arg(m_navigationId).arg(index.row());
104+ else if (m_navigationId.startsWith("childmiddle"))
105+ return QString("grandchild%1%2").arg(m_navigationId).arg(index.row());
104 case RoleLabel:
106 case RoleLabel:
105 return QString("%1Child%2").arg(m_navigationId).arg(index.row());
107 return QString("%1Child%2").arg(m_navigationId).arg(index.row());
106 case RoleHasChildren:
108 case RoleHasChildren:
107− return m_navigationId == "root" && index.row() != 3;
109+ return (m_navigationId == "root" && index.row() != 3) || (m_navigationId == "middle4");
108 case RoleIsActive:
110 case RoleIsActive:
109 return m_scope->currentNavigationId() == data(index, RoleNavigationId);
111 return m_scope->currentNavigationId() == data(index, RoleNavigationId);
110 }
112 }