From b8244ec0c5cb335f78247bc557e0ba6b130b2179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Mon, 11 May 2020 15:37:38 +0200 Subject: [PATCH] [apps] Fix margins of LanguageController Add margin at the bottom and fix margin values --- apps/on_boarding/language_controller.cpp | 6 +++++- apps/settings/main_controller.cpp | 2 +- apps/shared/language_controller.cpp | 6 +++--- apps/shared/language_controller.h | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/on_boarding/language_controller.cpp b/apps/on_boarding/language_controller.cpp index 3319b507c..f65fce0cd 100644 --- a/apps/on_boarding/language_controller.cpp +++ b/apps/on_boarding/language_controller.cpp @@ -1,11 +1,15 @@ #include "language_controller.h" #include "../global_preferences.h" #include "../apps_container.h" +#include namespace OnBoarding { LanguageController::LanguageController(Responder * parentResponder) : - Shared::LanguageController(parentResponder, (Ion::Display::Height - I18n::NumberOfLanguages*Metric::ParameterCellHeight)/2) + Shared::LanguageController( + parentResponder, + std::max(static_cast(Metric::CommonLeftMargin), + (Ion::Display::Height - I18n::NumberOfLanguages*Metric::ParameterCellHeight)/2)) { } diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 5464241ed..c8b922a81 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -22,7 +22,7 @@ MainController::MainController(Responder * parentResponder, InputEventHandlerDel m_selectableTableView(this), m_preferencesController(this), m_displayModeController(this, inputEventHandlerDelegate), - m_languageController(this, 13), + m_languageController(this, Metric::CommonTopMargin), m_examModeController(this), m_aboutController(this) { diff --git a/apps/shared/language_controller.cpp b/apps/shared/language_controller.cpp index 97f81123d..5c0897f53 100644 --- a/apps/shared/language_controller.cpp +++ b/apps/shared/language_controller.cpp @@ -5,12 +5,12 @@ namespace Shared { -LanguageController::LanguageController(Responder * parentResponder, KDCoordinate topMargin) : +LanguageController::LanguageController(Responder * parentResponder, KDCoordinate verticalMargin) : ViewController(parentResponder), m_selectableTableView(this, this, this) { - m_selectableTableView.setTopMargin(topMargin); - m_selectableTableView.setBottomMargin(0); + m_selectableTableView.setTopMargin(verticalMargin); + m_selectableTableView.setBottomMargin(verticalMargin); for (int i = 0; i < I18n::NumberOfLanguages; i++) { m_cells[i].setMessageFont(KDFont::LargeFont); } diff --git a/apps/shared/language_controller.h b/apps/shared/language_controller.h index fac81fb7c..6658ca550 100644 --- a/apps/shared/language_controller.h +++ b/apps/shared/language_controller.h @@ -8,7 +8,7 @@ namespace Shared { class LanguageController : public ViewController, public SimpleListViewDataSource, public SelectableTableViewDataSource { public: - LanguageController(Responder * parentResponder, KDCoordinate topMargin); + LanguageController(Responder * parentResponder, KDCoordinate verticalMargin); void resetSelection(); View * view() override;