D26634: Correctly compute bottom margin for grid delegates with subtitles

[Nathaniel Graham]

ngraham created this revision.
ngraham added reviewers: VDG, Plasma, broulik.
Herald added a project: Frameworks.
Herald added a subscriber: kde-frameworks-devel.
ngraham requested review of this revision.

REVISION SUMMARY
  When I added the subtitle feature, I didn't notice that the bottom margin calculation
  was only including the original single label. This patch fixes that to include the
  subtitle, if present.

TEST PLAN
  With D26531 <https://phabricator.kde.org/D26531> applied, before: F7881230: Before.png <https://phabricator.kde.org/F7881230>
  
  After: F7881229: After.png <https://phabricator.kde.org/F7881229>

REPOSITORY
  R296 KDeclarative

BRANCH
  compute-bottom-margin-correctly (branched from master)

REVISION DETAIL
  https://phabricator.kde.org/D26634

AFFECTED FILES
  src/qmlcontrols/kcmcontrols/qml/GridDelegate.qml

To: ngraham, #vdg, #plasma, broulik
Cc: kde-frameworks-devel, LeGast00n, GB_2, michaelh, ngraham, bruns
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20200113/da5ec8f2/attachment.html>