UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/calculation] Calculation::height has two types of margin arguments

Browse Source 
One for the margin between layouts and on top / at the bottom of the
cell, the other for the margin surrounding each layout.
This commit is contained in:
Léa Saviot
2020-05-19 14:17:26 +02:00
committed by EmilieNumworks
parent 78cac6ddae
commit 11c39b6206
9 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/calculation/history_controller.cpp
View File

@@ -208,7 +208,13 @@ KDCoordinate HistoryController::rowHeight(int j) {
return 0;
}
Shared::ExpiringPointer<Calculation> calculation = calculationAtIndex(j);
return calculation->height(App::app()->localContext(), HistoryViewCell::k_verticalMargin, j == selectedRow() && selectedSubviewType() == SubviewType::Output, false, &HistoryViewCell::CanBeSingleLine);
return calculation->height(
App::app()->localContext(),
HistoryViewCell::k_margin,
HistoryViewCell::k_inputOutputViewsVerticalMargin,
j == selectedRow() && selectedSubviewType() == SubviewType::Output,
false,
&HistoryViewCell::CanBeSingleLine);
}
int HistoryController::typeAtLocation(int i, int j) {