UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Fix margins of LanguageController

Browse Source 
Add margin at the bottom and fix margin values
This commit is contained in:
Léa Saviot
2020-05-11 15:37:38 +02:00
committed by Émilie Feral
parent d41b93c711
commit b8244ec0c5
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/on_boarding/language_controller.cpp
View File

@@ -1,11 +1,15 @@
#include "language_controller.h"
#include "../global_preferences.h"
#include "../apps_container.h"
#include <algorithm>
namespace OnBoarding {
LanguageController::LanguageController(Responder * parentResponder) :
Shared::LanguageController(parentResponder, (Ion::Display::Height - I18n::NumberOfLanguages*Metric::ParameterCellHeight)/2)
Shared::LanguageController(
parentResponder,
std::max(static_cast<int>(Metric::CommonLeftMargin),
(Ion::Display::Height - I18n::NumberOfLanguages*Metric::ParameterCellHeight)/2))
{
}

2
apps/settings/main_controller.cpp
View File

@@ -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)
{

6
apps/shared/language_controller.cpp
View File

@@ -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);
}

2
apps/shared/language_controller.h
View File

@@ -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;