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

[shared/localization_controller] Table cropping

Browse Source 
Forced the top cell of the country table to be cropped in the middle,
cutting the text, to avoid the cell looking squashed.

Change-Id: I4d126ed19249f47652bd7f2001384b2491cfe6f8
This commit is contained in:
Gabriel Ozouf
2020-10-01 12:03:22 +02:00
committed by Émilie Feral
parent b051242f2b
commit 25ab4b2a52
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/shared/localization_controller.cpp
View File

@@ -56,7 +56,6 @@ 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());
@@ -82,6 +81,20 @@ KDCoordinate LocalizationController::ContentView::layoutTableSubview(bool force,
KDCoordinate tableHeight = std::min<KDCoordinate>(
bounds().height() - verticalOrigin,
m_selectableTableView.minimalSizeForOptimalDisplay().height());
KDCoordinate tableHeightSansMargin = tableHeight - m_selectableTableView.bottomMargin();
if (m_controller->shouldDisplayWarning()) {
/* If the top cell is cut, bot not enough to hide part of the text, it will
* appear squashed. To prevent that, we increase the top margin slightly,
* so that the top cell will be cropped in the middle. */
KDCoordinate rowHeight = m_controller->cellHeight() + Metric::CellSeparatorThickness;
KDCoordinate incompleteCellHeight = tableHeightSansMargin - (tableHeightSansMargin / rowHeight) * rowHeight;
KDCoordinate offset = std::max(0, incompleteCellHeight - rowHeight / 2);
tableHeight -= offset;
verticalOrigin += offset;
m_borderView.setFrame(KDRect(Metric::CommonLeftMargin, verticalOrigin, bounds().width() - Metric::CommonLeftMargin - Metric::CommonRightMargin, Metric::CellSeparatorThickness), force);
}
m_selectableTableView.setFrame(KDRect(0, verticalOrigin, bounds().width(), tableHeight), force);
return verticalOrigin + tableHeight;
}