git.iko.soy/unity8
on xenial help sign in
Make headerless categories easier
815f50eMichał Sawicz
plugins/Dash/listviewwithpageheader.cpp−5
compare with xenial
unifiedsplit
@@ -141,8 +141,6 @@ void ListViewWithPageHeader::ListItem::setCulled(bool culled)
141void ListViewWithPageHeader::ListItem::setSectionItem(QQuickItem *sectionItem)
141void ListViewWithPageHeader::ListItem::setSectionItem(QQuickItem *sectionItem)
142{
142{
143 m_sectionItem = sectionItem;
143 m_sectionItem = sectionItem;
144− QQmlContext *context = QQmlEngine::contextForObject(m_item)->parentContext();
145− context->setContextProperty(QLatin1String("hasSectionHeader"), QVariant::fromValue<bool>(sectionItem != nullptr));
146}
144}
147
145
148ListViewWithPageHeader::ListViewWithPageHeader()
146ListViewWithPageHeader::ListViewWithPageHeader()
@@ -685,8 +683,6 @@ QQuickItem *ListViewWithPageHeader::getSectionItem(int modelIndex, bool alreadyI
685 return nullptr;
683 return nullptr;
686
684
687 const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
685 const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
688− if (section.isEmpty())
689− return nullptr;
690
686
691 if (modelIndex > 0) {
687 if (modelIndex > 0) {
692 const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);
688 const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);
@@ -877,7 +873,6 @@ void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)
877 QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();
873 QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();
878 context->setContextProperty(QLatin1String("ListViewWithPageHeader"), this);
874 context->setContextProperty(QLatin1String("ListViewWithPageHeader"), this);
879 context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));
875 context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));
880− context->setContextProperty(QLatin1String("hasSectionHeader"), QVariant::fromValue<bool>(false));
881 if (modelIndex == m_asyncRequestedIndex) {
876 if (modelIndex == m_asyncRequestedIndex) {
882 createItem(modelIndex, false);
877 createItem(modelIndex, false);
883 refill();
878 refill();
qml/Dash/GenericScopeView.qml+2−1
@@ -171,7 +171,7 @@ FocusScope {
171 top: parent.top
171 top: parent.top
172 left: parent.left
172 left: parent.left
173 right: parent.right
173 right: parent.right
174− topMargin: hasSectionHeader ? 0 : units.gu(2)
174+ topMargin: name != "" ? 0 : units.gu(2)
175 }
175 }
176
176
177 Behavior on height {
177 Behavior on height {
@@ -373,6 +373,7 @@ FocusScope {
373 objectName: "dashSectionHeader" + (delegate ? delegate.category : "")
373 objectName: "dashSectionHeader" + (delegate ? delegate.category : "")
374 property var delegate: categoryView.item(delegateIndex)
374 property var delegate: categoryView.item(delegateIndex)
375 width: categoryView.width
375 width: categoryView.width
376+ height: section != "" ? units.gu(5) : 0
376 text: section
377 text: section
377 textColor: scopeStyle ? scopeStyle.foreground : "grey"
378 textColor: scopeStyle ? scopeStyle.foreground : "grey"
378 }
379 }