Commit Graph

59 Commits

Author SHA1 Message Date
Ruben Dashyan
0943406263 Fix HistoryViewCell and ScrollableExactApproximateExxpressionsCell margins issue
Remove all margins from those cells.
Rather add margins to their respective subviews:
 - ScrollableExpressionView
 - ScrollableExactApproximateExpressionsView.

As a notable consequence, the distance in HistoryViewCell between its
subviews becomes 10 instead of 5.

In passing, replace
 - Metric::HistoryHorizontalMargin = 10
 - ScrollableExactApproximateExpressionsView::k_digitHorizontalMargin = 10
 - HistoryViewCell::k_digitVerticalMargin = 5
 - ScrollableExactApproximateExpressionsCell::k_margin = 5
by
 - Metric::CommonSmallMargin = 5
 - Metric::CommonLargeMargin = 10.
2019-02-18 16:49:58 +01:00
Ruben Dashyan
da0d42ca3b [apps/calculation/history_view_cell] Fix background colors
Set m_inputView's m_expressionView's background color
2019-02-18 16:49:58 +01:00
Ruben Dashyan
0e0b49acce [apps/calculation] Remove HistoryViewCell horizontal margins 2019-02-18 16:49:58 +01:00
Ruben Dashyan
8029aab060 [apps/calculation] Remove unecessary namespace 2019-02-18 16:49:58 +01:00
Émilie Feral
f7193602ef [calculation] Bug in the subview selected with heigh cells
In SelectableTableView::selectCellAtLocation, we call 'tableViewDidChangeSelection'
before scrolling. Therefore, the cell with updated with the right selected subview
is not the one drawn... To solve this issue, we keep the selectedSubview ('model')
 in the HistoryController instead of in the limited-lifespan view.
2018-12-06 14:52:23 +01:00
Léa Saviot
8e6cff9572 [apps] Remove faulty assertion 2018-11-23 12:04:03 +01:00
Léa Saviot
196e74297e [apps] Rename exact/approx as left/right in scrollable_exact_approx_exp_view 2018-11-23 12:04:03 +01:00
Léa Saviot
d083d05609 [apps/calculation] Display the exact layout only when the exp is Store 2018-11-23 12:04:03 +01:00
Léa Saviot
ed5a6d4a03 [apps/calculation] Remove unneeded arguments 2018-11-19 18:02:55 +01:00
Émilie Feral
4e8cd02d3f [calculation] Fix memoization: hold the calculation and not its address
which is likely to have changed
2018-09-21 18:16:21 +02:00
Léa Saviot
8b75802746 [calculation] Don't recompute HistoryViewCell layout if same calculation 2018-09-20 17:21:34 +02:00
Émilie Feral
365b145cf3 [poincare] Change names: LayoutReference-->Layout 2018-09-18 16:29:44 +02:00
Émilie Feral
616e4c0bcc [poincare] Change name: LayoutRef --> LayoutReference 2018-09-14 16:57:12 +02:00
Émilie Feral
33f7ca841c [shared] Change
ScrollableExactApproximateExpressionsView::setExpressions to setLayouts
2018-09-07 10:02:48 +02:00
Léa Saviot
71c807b565 [poincare] Node->isDefined becomes !Node->isUninitialized 2018-08-14 16:40:12 +02:00
Léa Saviot
5d9e69dedc [poincare] Remove Tree constructors that use nullptr as parameter 2018-08-14 14:58:47 +02:00
Léa Saviot
f579e95815 [poincare] Start removing ExpressionLayout 2018-07-03 17:33:06 +02:00
Émilie Feral
ac9da8d559 [escher] Handle copy/cut event on Expression in selectable table view 2018-06-07 14:46:14 +02:00
Émilie Feral
1f57d0a242 [solver] Fix an even odd bug: make colors consistent between even odd
cells and inheriting even odd cells
(scrollable_exact_approximate_expressions_cell)
2018-06-07 13:46:18 +02:00
Émilie Feral
cfb891d7bd [shared] Move OutputExpressionView & ScrollableOuputExpression view to shared/ with new name:
ScrollableExactApproximateExpressionsView (for future implementation of solver
solution page)
2018-06-07 13:46:18 +02:00
Émilie Feral
1108ef21db [calculation] Do not memoize the expression layouts but the expressions
final height to avoid overflowing the heap. The expression layouts are
kept in the cell which are fewer then the number of calculations
2018-05-16 18:36:45 +02:00
Émilie Feral
bb8ab2a42e Merge branch 'saisie-jolie' into master-merge-saisie-jolie 2018-05-16 11:28:07 +02:00
Émilie Feral
1d7bd2b70a [calculation] Change method name: shouldDisplayApproximateOutput --> shouldOnlyDisplayApproximateOutput 2018-05-15 11:33:28 +02:00
Émilie Feral
b84972da6a [apps] Calculation: Memoization of the equal sign type (approximate or
equal) in the model
2018-05-15 11:33:28 +02:00
Léa Saviot
c4b5d4cf40 Merge branch 'SaisieJolieRebase1201' into SaisieJolieMerge10Apr
Change-Id: I802dbb9f7c0eebf75a1b6cd21ddd194e89b53752
2018-04-10 17:21:54 +02:00
Émilie Feral
f2db9f2065 [apps] Calculation: exact and approximate output can be equal even if
the exact output is not a rational: 1/2+i = 0.5+i
2018-01-30 19:14:42 +01:00
Émilie Feral
03c8b373f7 [apps] Calculation: update the equal sign view according to the
calculation outputs
2018-01-30 19:14:42 +01:00
Émilie Feral
17fc7998a2 [apps] Calculation: Ans is exact only when the expression hold is exact 2018-01-16 15:17:16 +01:00
Léa Saviot
4ad3adaab2 [apps/escher] Changed setExpression to setExpressionLayout.
Change-Id: I095a12868fd7eaf8d4eb2408617941a86f43e1ee
2018-01-15 11:58:01 +01:00
Romain Goyet
52bdf4a41f Merge branch 'cas_with_app_copy' into python_console 2017-11-21 18:44:38 +01:00
Émilie Feral
b2d6c2e305 [apps] In calculation, avoid blinking when changing selection
Change-Id: I8b94362183e1aed0d87cfdfa39b3f67ccbbd8b42
2017-11-21 17:37:25 +01:00
Émilie Feral
bb590bc529 [apps/calculation] Valgrind: fix call to deleted memory
Change-Id: I36e25684dfd260e04ce29fe0698c179e372030d4
2017-11-21 17:37:25 +01:00
Émilie Feral
5fd8fda4b1 [calculation] Display exact and approximate results
Change-Id: Id5fe5b5db464c45f09bd1a1285def95e738a78c7
2017-11-21 17:37:25 +01:00
Léa Saviot
239e702d37 [code] Navigation in the console history.
The user can copy previous commands or results, into the clipboard or in
the console prompt.

Change-Id: I280fff2d4937f4d17ab6c8907d6e5c359a322372
2017-11-17 11:59:50 +01:00
Émilie Feral
71284311bb [escher] [apps] Implement app snapshot
Change-Id: I24d7eed7cef964af8be1c85222e758c297dc0da1
2017-05-18 14:16:41 +02:00
Émilie Feral
96733dbbdc [apps] Rule of 5 (3)
Change-Id: Ia85b23a09e9debd62b4f3590463a4f16454ef4b7
2017-05-09 14:33:53 +02:00
Émilie Feral
784fe53679 [apps/calculation] Reset expression scroll when changing selection
Change-Id: Ia2a46a7d39c735d55947cca03a8f84e1f711d12b
2017-03-29 15:04:26 +02:00
Émilie Feral
21a6ae216a [escher] Create a class scrollable view
Change-Id: I2c588da1f6fd6b1bde878f85c02d0e4dffd04f52
2017-03-07 13:28:26 +01:00
Émilie Feral
0704ab8776 [apps][escher] Improve colors
Change-Id: I31d3353a5372b63a6c2b3e62c88fb3b5c627e088
2017-01-27 11:46:13 +01:00
Émilie Feral
d45000b3d9 [escher] In palette, improve colors
Change-Id: I2c8f33764cf2befeb994b9b47b46d39f116ae96c
2017-01-27 11:46:05 +01:00
Émilie Feral
ca1b61c97a [apps] Avoid switch() {} when possible.
Change-Id: I4e050dcb761fe5ca6a12af375537f3554f324f68
2017-01-15 20:04:59 +01:00
Émilie Feral
172528f49f [apps/calculation] Change names: PrettyPrintView -->
ScrollableExpressionView and make result View an scrollable expression
view

Change-Id: I9ac85671bcb4fdbeda0e5dbc6788dc7eb93b7343
2016-12-09 11:01:44 +01:00
Émilie Feral
e1f808e7da [apps/calculation] Change names: expression->input, evaluation->output
Change-Id: I9d65a9fc7d1b7132ae3aaa8a86e4511286b7e3da
2016-12-09 11:01:44 +01:00
Émilie Feral
0448278e36 [calculation] Make the results of calculation expressions
Change-Id: I9eb685b21944cfc6cc346a42d442f064ae5938dd
2016-12-08 15:21:52 +01:00
Romain Goyet
b87f06e3a2 [ion] Update the Event model
Change-Id: I41a53caeb7dd8a15e7934f49675f6a53be8fe7be
2016-11-10 17:29:48 +01:00
Émilie Feral
2f45578886 [apps/calculation] Handle calculation to heigh to be fully displayed in
the screen

Change-Id: I182f0c76d911e6686223a22be2a6ddb561b287ec
2016-11-04 14:47:07 +01:00
Émilie Feral
0913798faf [apps] Replace magic numbers by constants
Change-Id: If9cb40bdc9b1e88a941a6f230fb42164b1e2d5f0
2016-11-04 10:58:40 +01:00
Émilie Feral
1371d807c1 [apps/calculation] Handle enter on a history view cell
Change-Id: Id3e9c38688a4ed7395e3e2cb6e64581681cad9ad
2016-11-02 09:46:10 +01:00
Émilie Feral
6e13c43c37 [app/calculation] in history view cell, make only pretty print responder
Change-Id: I9dbd5d150e5fdcc52e5ad38b2e9524d1b5a87fae
2016-11-02 09:46:09 +01:00
Émilie Feral
e22834216d [apps/calculation] Fit the layout of result view to the size of the
float text

Change-Id: Iad6b2021a23c491b166e518bba625dcf69c3757a
2016-11-02 09:46:09 +01:00