From 8a87bcfc5b523af5c56d32a28a9ea192552ab9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Tue, 11 Feb 2020 10:07:20 +0100 Subject: [PATCH] [apps/settings] SelectableViewWithMessages: position the additional messages at the bottom of the view --- apps/settings/sub_menu/selectable_view_with_messages.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/settings/sub_menu/selectable_view_with_messages.cpp b/apps/settings/sub_menu/selectable_view_with_messages.cpp index 9ba391f3a..2c4bdf6c7 100644 --- a/apps/settings/sub_menu/selectable_view_with_messages.cpp +++ b/apps/settings/sub_menu/selectable_view_with_messages.cpp @@ -6,6 +6,8 @@ using namespace Shared; namespace Settings { +static inline KDCoordinate maxCoordinate(KDCoordinate x, KDCoordinate y) { return x > y ? x : y; } + SelectableViewWithMessages::SelectableViewWithMessages(SelectableTableView * selectableTableView) : m_selectableTableView(selectableTableView), m_numberOfMessages(0) @@ -45,7 +47,7 @@ void SelectableViewWithMessages::layoutSubviews(bool force) { // Layout the text KDCoordinate textHeight = KDFont::SmallFont->glyphSize().height(); - KDCoordinate defOrigin = tableHeight + (bounds().height() - tableHeight - m_numberOfMessages*textHeight - Metric::CommonTopMargin)/2; + KDCoordinate defOrigin = maxCoordinate(bounds().height() - Metric::CommonBottomMargin - m_numberOfMessages*textHeight, tableHeight); for (int i = 0; i < m_numberOfMessages; i++) { m_messageLines[i].setFrame(KDRect(0, defOrigin, bounds().width(), textHeight), force);