UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 16:57:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,580 Commits 11 Branches 65 Tags
upsilon-dev-geometry
Commit Graph

143 Commits

Author SHA1 Message Date
lolocomotive
bd207cb845 Replace hard-coded color values with Palette colors and use the correct palette colors (#51) 2021-10-20 22:25:27 +02:00
Quentin Guidée
e8b86ca6a1 [upstream] Update 2020-10-10 02:28:33 +02:00
Hugo Saint-Vignes
0b683b6994 [apps/shared] Handle identical layout in MinimalSizeForOptimalDisplay 
Change-Id: I99a523e9e88ea9c3064e4367d96b01edb0020df9
 2020-08-11 17:06:07 +02:00
Quentin Guidée
a74a5ac796 [fix] conflicts 2020-08-09 13:28:22 +02:00
Émilie Feral
df74c2c551 [apps/calculation] The heights (common and expanded) of calculation cells are 
computed when the calculation is added to the store and don't change afterwards.
Otherwise, if their heights change when scrolling (due to a modification of the
display output type - ExactOnly, ApproximateOnly...), it generates crashes.
 2020-07-16 14:37:38 +02:00
Joachim LF
d7ac7e19bb [Update] Epsilon 14 2020-07-13 10:36:47 +02:00
Léa Saviot
1128134c37 [apps/calculation] Raise exception if row height miscomputed 
Scenario:
Put the complex mode to exponential, then go back to Calculation and:
Toolbox, Down, Down, Down, Down, OK, OK, Two, Plus, Imaginary,
Toolbox, Down, Down, Down, Down, OK, Down, OK, Two, Plus,
Imaginary, OK, Toolbox, Down, Down, Down, Down, Down, OK,
Down, OK, Up, OK, Right, Zero, OK, OK, Toolbox, Down,
Down, OK, Toolbox, Back, Up, Zero, Up, OK, Zero, Up, Up, Up
 2020-07-07 09:46:26 +02:00
Quentin
db10723e76 [Update] Upstream 2020-06-18 19:25:17 +02:00
Léa Saviot
8412087cc8 [apps/calculaiton] Fix cursor bug 
Scenario:
1 EXE MATRIX MATRIX Down Down 1 Up Up -> it crashed
 2020-06-04 14:50:10 +02:00
Léa Saviot
a56a73b0ba [apps/calculation] Fix calculation height computation 
It was done in two places before, which created inconsistencies
 2020-05-28 04:44:27 -07:00
Léa Saviot
5535145b51 [apps/calculation] Calculation on 2 lines if does not fit when expanded 
Scenario: 1+1+1+1+1+1+1+10.5 fits on one line when not expanded, but
when the exact result is displayed not -> we thus always display it on
two lines
 2020-05-28 04:44:27 -07:00
Léa Saviot
feee0a673c [apps/calculation] HistoryViewCell cleaning 2020-05-28 04:44:27 -07:00
Léa Saviot
6948011ae0 [apps/calculation] Handle navigation in single lined output 2020-05-28 04:44:27 -07:00
Léa Saviot
579485c8c0 [apps/calculation] CanBeSingleLine differs if args are view/layout sizes 
If the sizes are for layouts, we need to add the margins added by the
views.
 2020-05-28 04:44:27 -07:00
Léa Saviot
11c39b6206 [apps/calculation] Calculation::height has two types of margin arguments 
One for the margin between layouts and on top / at the bottom of the
cell, the other for the margin surrounding each layout.
 2020-05-28 04:44:27 -07:00
Léa Saviot
78cac6ddae [apps/calculation] Calculation::height has CanBeSingleLine argument 2020-05-28 04:44:27 -07:00
Léa Saviot
1c2801907f [apps/calculation] Factorize and clean code 2020-05-28 04:44:27 -07:00
0b101
b48d3d6e4a Added a new compact result display mode 2020-05-28 04:44:27 -07:00
Quentin
3013dda9d6 [Fix] Conflicts 2020-04-16 14:12:38 +02:00
Quentin
f37040dc8a [Fix] Conflicts 2020-04-16 14:04:56 +02:00
Romain Goyet
950862f8d0 Use std::min and std::max 2020-04-14 09:31:02 -04:00
Quentin
aea963dac0 [Fix] Fix conflicts ._. 2020-04-07 14:53:19 +02:00
Émilie Feral
300de8fb15 [apps/calculation] HistoryViewCell: when changing SubviewType, set the 
right subcell as first responder!

This fixes the following bug: when selecting a cell whose content is too
long to be displayed, the scrolling is broken
 2020-04-03 10:42:42 +02:00
David
2913bcb8b5 [Fix] Bug with the default display mode 2020-02-26 17:44:52 +01:00
David
88f202c4e7 [Fix] Improved the compact result display 2020-02-25 15:14:38 +01:00
Quentin Guidée
5420a8a34f Merge remote-tracking branch 'upstream/master' into omega-hotfix 2020-02-20 23:41:50 +01:00
Émilie Feral
24d9f37205 [apps/calculation] Clean how cell subtype is selected/ 
This fixes crashes: indeed, in the way it was done before, we called
scrollToSubviewOfTypeOfCellAtLocation after setting the new selected subtype
and before reloading the data. However, selecting a new subtype might expand
the selected cell which can temper with the cell repartition. If so, we need to
reload the data to be able to call 'selectedCell' for instance.
 2020-02-20 10:56:11 +01:00
Quentin Guidée
73736c9b15 Fix conflicts 2020-02-20 00:42:47 +01:00
Émilie Feral
2a03583fe0 [apps/calculation] Reset history cell memoization when reloading the 
table. Otherwise, the Poincare pool store useless layouts for cells that
aren't displayed.

This fixes the following issue: input "(transpose([1 2 3 4 5 6][1 2 3 4 5
6])^8", the computation works, clear the history, input the same
calculation again, it fails with a memory error.
 2020-02-19 10:34:28 +01:00
0b101
0a07a82a96 Added Compact Result Display 2020-02-16 12:47:29 -06:00
Quentin Guidée
ab8f731515 Fixed some conflicts 2020-02-12 17:42:58 +01:00
Émilie Feral
a82ff2b703 [apps/calculation] HistoryController: in historyViewCellDidChangeSelection, 
limit the whole table reloading to cases where the cell height did
actually change to avoid useless blinking
 2020-02-12 15:13:22 +01:00
Émilie Feral
71de56f87a [apps/calculation] HistoryViewCell: fix setHighlighted to reload 
subviews highlight
 2020-02-12 15:13:22 +01:00
Émilie Feral
b39b8da036 [apps/calculation] HistoryViewCell: prevent from selecting ellipsis 
suview if it not visible
 2020-02-12 15:13:22 +01:00
Émilie Feral
a39ca58470 [apps/calculation] HistoryViewCell: fix first responder. The first 
responder is the HistoryViewCell when the ellipsis subview is selected
 2020-02-12 15:13:22 +01:00
Émilie Feral
767d1654cc [apps/calculation] HistoryViewCell: select the right expression of 
output when coming from ellipsis subview
 2020-02-12 15:13:22 +01:00
Émilie Feral
39dbb7d68c [apps/calculation] Fix relayouting when highlighted cell changed 
This fixes the following scenario: add "1.2" 5 times, go up three times,
and down three times, the last cell was not correctly relayout.
 2020-02-12 15:13:22 +01:00
Émilie Feral
7d0a1cd0b2 [apps/calculation] HistoryViewCell: enable selecting the ellipsis 2020-02-12 15:13:22 +01:00
Émilie Feral
9a97fc01b2 [apps/calculation] HistoryViewCell: m_expandedCalculation memoizes true 
only when the calculation is actually expanded (when the output is
selected and the display output is ExactApproximateToggle)

This avoid blinking when changing input/output selection
 2020-02-12 15:13:22 +01:00
Émilie Feral
f276a88e79 [apps/calculation] HistoryViewCell: display ellipsis view when 
highlighted
 2020-02-12 15:13:22 +01:00
Émilie Feral
251db5b60e [apps/shared][apps/calculation] Change class names: 
ScrollableInputExactApproximateExpressionsCell -->
ScrollableThreeExpressionsCell
AbstractScrollableExactApproximateExpressionsView -->
AbstractScrollableMultipleExpressionsView
ScrollableExactApproximateExpressionsView -->
ScrollableTwoExpressionsView
ScrollableInputExactApproximateExpressionsView -->
ScrollableTwoExpressionsCell
 2020-02-12 15:13:22 +01:00
Émilie Feral
56319ef275 [apps/shared] AbstractScrollableExactApproximateExpressionsView can hold up to 
three expressions but no more BurgerMenuView.
ScrollableExactApproximateExpressionsView and
ScrollableInputExactApproximateExpressionsView inherit from it.
 2020-02-12 15:13:22 +01:00
Émilie Feral
398b529811 [apps/calculation][poincare] AdditionalInformationType is determined 
from both input and output expressions of a Calculation
 2020-02-12 15:13:21 +01:00
Léa Saviot
97c5ef79af [apps/calc] Display ApproximateOnly if approximate layout cannot be created 2020-02-12 15:13:21 +01:00
Léa Saviot
1af28d4310 [apps/calc] Display ApproximateOnly if exact layout cannot be created 2020-02-12 15:13:21 +01:00
Émilie Feral
90957d137a [apps/calculation] HistoryViewCell: avoid blinking 2020-02-12 15:13:20 +01:00
Émilie Feral
f52f25e491 [calculation] HistoryViewCell: add TODO 2020-02-12 15:13:20 +01:00
Émilie Feral
73a8ec24f2 [calculation] Revert "HistoryViewCell: remove useless m_expandedCalculation" 
When scrolling up and down, only 'setCalculation' is called by
'willDisplayCellForIndex' - and not 'cellDidSelectSubview'. So a new cell
should be informed of the expanded state in 'setCalculation'.
 2020-02-12 15:13:20 +01:00
Émilie Feral
c47394ae22 [calculation] (revert previous commit) HistoryViewCell: setCalculation 
should decide which subviews is displayed.
'setCalculation' is the only method called when scrolling (when using
a new cell for a calculation) so it should take into accound whether the
cell is expanded or not.

This fixes the bug: when pushing several calculations (which expand) in
the store, scrolling up and down corrupts the cells contents
 2020-02-12 15:13:20 +01:00
Émilie Feral
9312d2bd65 [escher] ExpressionTableCell is composed of a ScrollableExpressionView 
instead of an ExpressionView
 2020-02-12 15:13:19 +01:00