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

[shared/localization_controller] Add top border

Browse Source 
When selecting a country, the table would be cropped by the text, with
no separator between the white of the cropped cell and the background
color.

Change-Id: Ia6be40bce40b7cdb3efa064989d45ef5c046e364
This commit is contained in:
Gabriel Ozouf
2020-09-11 14:05:00 +02:00
committed by Émilie Feral
parent 913c81a0d3
commit 4b965a0ff6
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/shared/localization_controller.cpp
View File

@@ -10,7 +10,8 @@ constexpr int LocalizationController::ContentView::k_numberOfCountryWarningLines
LocalizationController::ContentView::ContentView(LocalizationController * controller, SelectableTableViewDataSource * dataSource) :
m_controller(controller),
m_selectableTableView(controller, controller, dataSource),
m_countryTitleMessage(KDFont::LargeFont, I18n::Message::Country)
m_countryTitleMessage(KDFont::LargeFont, I18n::Message::Country),
m_borderView(Palette::GrayBright)
{
m_countryTitleMessage.setBackgroundColor(Palette::WallScreen);
m_countryTitleMessage.setAlignment(0.5f, 0.5f);
@@ -24,16 +25,19 @@ LocalizationController::ContentView::ContentView(LocalizationController * contro
}
int LocalizationController::ContentView::numberOfSubviews() const {
return 1 + m_controller->shouldDisplayTitle() + k_numberOfCountryWarningLines * m_controller->shouldDisplayWarning();
return 1 + m_controller->shouldDisplayTitle() + (k_numberOfCountryWarningLines + 1) * m_controller->shouldDisplayWarning();
}
View * LocalizationController::ContentView::subviewAtIndex(int i) {
assert(i < numberOfSubviews());
/* FIXME : This relies on the fact that the title is never displayed without the warning. */
/* This relies on the fact that the title is never displayed without the warning. */
assert((!m_controller->shouldDisplayTitle()) || m_controller->shouldDisplayWarning());
switch (i) {
case 0:
return &m_selectableTableView;
case 3:
return &m_borderView;
case 4:
return &m_countryTitleMessage;
default:
return &m_countryWarningLines[i-1];
@@ -52,6 +56,7 @@ void LocalizationController::ContentView::layoutSubviews(bool force) {
}
if (m_controller->shouldDisplayWarning()) {
origin = layoutWarningSubview(force, Metric::CommonTopMargin + origin) + Metric::CommonTopMargin;
m_borderView.setFrame(KDRect(Metric::CommonLeftMargin, origin, bounds().width() - Metric::CommonLeftMargin - Metric::CommonRightMargin, Metric::CellSeparatorThickness), force);
}
origin = layoutTableSubview(force, origin);
assert(origin <= bounds().height());

1
apps/shared/localization_controller.h
View File

@@ -62,6 +62,7 @@ protected:
SelectableTableView m_selectableTableView;
MessageTextView m_countryTitleMessage;
MessageTextView m_countryWarningLines[k_numberOfCountryWarningLines];
SolidColorView m_borderView;
};
SelectableTableView * selectableTableView() { return m_contentView.selectableTableView(); }