Commit Graph

48 Commits

Author SHA1 Message Date
Léa Saviot
72f6946b14 [poincare] Rename BracketRight/LeftLayout -> Right/LeftBracketLayout.
Change-Id: I382ac960aeca861d1003cd2373709a6759ded685
2018-04-19 16:16:17 +02:00
Léa Saviot
a2f2a64bbd [poincare] Remove use of BracketLeft/RightLayouts. Saves the binary 2K.
Change-Id: I09ffa22aaffd32eb58f00437512b0da2fab6bb6a
2018-04-19 16:16:17 +02:00
Léa Saviot
1e9b4d4c07 [poincare] Rename backspaceAtCursor -> deleteBeforeCursor
Change-Id: Ia5196b46fa58a82347bb1b02a7b7ef9a816ff66f
2018-04-19 16:16:17 +02:00
Léa Saviot
70f28aea4b [Coding style] Change "brother" into "sibling"
Change-Id: I6f07be262358641875d3024d1741285c5895b8d6
2018-04-19 16:16:17 +02:00
Léa Saviot
e4dccc8cc1 [poincare] Rename ParenthesisLeftLayout into LeftParenthesisLayout
Change-Id: Iaedd556ce912d650432d395b294c39e53bfc16a0
2018-04-19 16:16:05 +02:00
Léa Saviot
16fa9a0975 [poincare] Rename ParenthesisRightLayout into RightParenthesisLayout
Change-Id: I4f104d5a214c98024ad2e0a0bb2f5ffe63c92495
2018-04-19 15:12:06 +02:00
Léa Saviot
e503fc8fd6 [poincare] Use equivalentPointedBrotherLayout.
Change-Id: Ie1b04127bea7bfccb7dc870cc131f6f0fc531b97
2018-04-18 16:26:13 +02:00
Léa Saviot
2f4ad7576c [poincare] Fix hide/showEmptyLayout.
Change-Id: I2e042b3aac232f44c59960f165eb93a770cfa243
2018-04-18 16:11:17 +02:00
Léa Saviot
afcac95315 [poincare] The cursor changes its size.
Change-Id: I3366ff956a9f12b347a8b05066800619e61308c5
2018-04-18 15:23:55 +02:00
Léa Saviot
83b243977d [poincare] Adding multiple empty powers is better maneged
Change-Id: I58609d4a13eadf7171d05796dbe743507fa85853
2018-04-17 17:13:33 +02:00
Léa Saviot
f07127b68b [escher/poincare] Remove duplicate function
Change-Id: Ie7ab03d1f2716d751f85a9f9747b064892a9b19e
2018-04-17 15:42:07 +02:00
Léa Saviot
20935db3d5 [poincare] Collapse after inserting layout.
Change-Id: I6251d4603e3adb883ffc64b1659cae889c349227
2018-04-17 14:05:38 +02:00
Léa Saviot
42e15d6a15 [poincare] Move the cursor when collapsing a layout
Change-Id: I28a80ac19310214044bad653a6f887956d1fdacc
2018-04-17 14:05:37 +02:00
Léa Saviot
9f0755a330 [poincare] NthRootLayoutcan collapse its brothers on the right.
Change-Id: Iba3c6c197029036adf3dce20b6c6bd5173e448ce
2018-04-17 14:05:37 +02:00
Léa Saviot
8d5b40c351 [poincare] Add collapseBrothers method on ExpressionLayout.
Change-Id: Ia4be10b42ae8db300ce1ce7029175a92a667c808
2018-04-17 14:05:37 +02:00
Léa Saviot
3abb619283 [poincare] Hiding/Show EmptyLayouts: check pointed layout's neighbour
Change-Id: I5f6977de5c14e409b40f7f371d5dfa390f2dca37
2018-04-17 10:06:14 +02:00
Léa Saviot
ba97e63580 [poincare] EmptyVisibleLayout becomes EmptyLayout.
Change-Id: I2e33cf32ced72e47c72d2793fcc6cd98aac4eb4d
2018-04-16 17:49:10 +02:00
Léa Saviot
1342c0f2db [poincare] Fix empty layout that stayed
When typing 1|23 then pressing / and poing up.

Change-Id: I15752919914af526b35483b2abf2a027cddc4e7b
2018-04-16 17:41:56 +02:00
Léa Saviot
9b22175877 [poincare] Hide EmptyLayout when the cursor is next to it.
Change-Id: I487b99105229451d033999a12e510b3370e63093
2018-04-16 17:26:57 +02:00
Léa Saviot
a1da582573 [poincare] Fix power insertion
Example: 12|3 and the cursor is on the left of the 3
Addig a power also adds an empty base, because of a mistake in
baseForNewPowerLayout().

Change-Id: I12de33baca7fa03fb5d34b6a928a85b11a1d389f
2018-04-16 12:17:17 +02:00
Léa Saviot
7fd3b965eb [poincare] Fixed HorizontalLayout empty child removal.
Change-Id: Ic956a98b2637dafeda7c6e7476caa789ce398321
2018-01-29 17:07:26 +01:00
Léa Saviot
d217832ba1 [poincare] Fix bug when inserting a fraction between base and indice.
Change-Id: I4e3f6a5b6aee251a99e580dde7cb65b753f99ac5
2018-01-26 17:43:05 +01:00
Léa Saviot
8f17807fc1 [poincare] Fixed power layout insertion bug.
The method to determine if an empty base layout should also be inserted
had a bug.

Change-Id: I6c5e0de033eaee8a21a39f3eaffa18b259865a6e
2018-01-26 14:54:35 +01:00
Léa Saviot
b9a7973961 [escher/poincare] Move the cursor when inserting a layout (if wanted).
The new pointed layout can be specified. If not, the cursor will be on
the right of the new layout.

Change-Id: I5e0c37cf6365447f8eaf354dc5e86a24c6981034
2018-01-24 10:18:12 +01:00
Léa Saviot
1ad4e6e744 [escher/poincare] Remove unneeded layout computation.
When moving a cursor in an EditableExpressionView, do not recompute the
layout, unless specified otherwise (for instance when entering or
exiting a MatrixLayout).

Change-Id: Ic2471095d6f6a08014a79f1d9d8fb7d39a1a6864
2018-01-18 17:55:16 +01:00
Léa Saviot
3cda4a881d [poincare] Fix new power layout bug.
There was a problem when assessing if there was a need for an empty base
layout.

Change-Id: I9d6f84d3cc797fc0a701395dd8289590a4ab849a
2018-01-17 15:32:55 +01:00
Léa Saviot
62ae5840e9 [apps/poincare] Handle cursor positioning in EditableExpressionView.
There cursor was not in the right place for log(), cos(), ...

Change-Id: I8fe1f350f3054460204cb5d40508212642333e3e
2018-01-16 16:43:40 +01:00
Léa Saviot
5ff32b8162 [expression_editor] Controller::handleAddEvent returns void.
Change-Id: Iaac5fd3d0798f5c2e81d3c982198f402534f6dfe
2018-01-15 11:58:07 +01:00
Léa Saviot
2ed72127cb [poincare] Remove dangerous default arguments in poincare.
Change-Id: I76f2bc057d73c7d151aed62b66eb69a91082910c
2018-01-15 11:58:07 +01:00
Léa Saviot
d105dcc7f9 [expression_editor] Grey outer cells for MatrixLayout.
Change-Id: Iaf33ccd6c746843803b6a971a2b37eaf495fa766
2018-01-15 11:58:06 +01:00
Léa Saviot
2c562fdf7a [expression_editor] Insert an empty matrix when adding a bracket.
Change-Id: I5bf6ab9e097637e0e49f0941fe02e4f5a8e373a2
2018-01-15 11:58:06 +01:00
Léa Saviot
5d39f177ba [poincare] Decide to delete EmptyLayouts when merging HorizontalLay.
A bool in HorizontalLayout::addOrMergeChildAtIndex decides whether to
delete the Emtpy new HorizontalLayout children.

Change-Id: Ie7acd7f5052891a929c2ae22cb74de389649cba2
2018-01-15 11:58:06 +01:00
Léa Saviot
29e877ec92 [poincare] NthRootLayout is now a BoundedStaticLayoutHierarchy.
It can now handle having an index or not (simple square root layout).

Change-Id: I7a3795c62873fa0a356719b8d572dd5a5be53c94
2018-01-15 11:58:05 +01:00
Léa Saviot
fda1840be4 [expression_editor] The button "log" inserts a logarithm without index.
Change-Id: Ib82cccb076c34c69c3112ade7a41139da15e96c0
2018-01-15 11:58:05 +01:00
Léa Saviot
6526a82c17 [poincare] No "Inside" position for ExpressionLayoutCursor.
Change-Id: Id979c372bb2c4acf8f8708380c7d1f2aeeb5ff06
2018-01-15 11:58:05 +01:00
Léa Saviot
9753228a3d [poincare] Use the VerticalOffsetLayouts.
Change-Id: I6dfc61f95016fd9863b7a4b1f41dc1784560807b
2018-01-15 11:58:04 +01:00
Léa Saviot
8a7e4e598c [expression_editor] Collapse brothers when adding a fraction.
Change-Id: I4d75fae152fca4a6671abd1e444f6aaa27c168b5
2018-01-15 11:58:04 +01:00
Léa Saviot
25c036a078 [expression_editor] Set cursor position according to the layout inserted.
Change-Id: Iac33efdeb4b725ae6007282d323f446992873832
2018-01-15 11:58:04 +01:00
Léa Saviot
1a3c391237 [expression_editor/poincare] General "delete" rule.
Change-Id: I5c16f19aacdac312156f45c88c189adfb72f03e8
2018-01-15 11:58:03 +01:00
Léa Saviot
0d8b6d5ace [escher/poincare] Handle toolbox input (VERY DIRTY).
Change-Id: I01de0ddd6f6500df278e3b4104110f6335289be1
2018-01-15 11:58:02 +01:00
Léa Saviot
8289e24cfe [expression_editor] Handle XNT event.
Change-Id: I0af832ec0f693c445e424d21795b14cfb4e54622
2018-01-15 11:58:02 +01:00
Léa Saviot
7b2c48465e [expression_editor] Handle Exp, Log, Power, Sqrt and Square events.
Change-Id: I96ab58d6f66fcb6aa95ba849d927236cfb5fcc28
2018-01-15 11:58:02 +01:00
Léa Saviot
4d94764c36 [expression_editor] Controller code cleaning.
Change-Id: Ifb31ad712ce9c59e21fc3d670d05f60a15669d60
2018-01-15 11:58:02 +01:00
Léa Saviot
a4c014c75e [expression_editor/poincare] Move Down in an ExpressionLayout.
Change-Id: I87f3394cce5eb4936ab926d5e92fdf44d4473cf7
2018-01-15 11:58:01 +01:00
Léa Saviot
fc8cd6c06e [expression_editor/poincare] Move Up in an ExpressionLayout.
Change-Id: I75fd91233729afd4eb77d8e9d53c102a632643ea
2018-01-15 11:58:01 +01:00
Léa Saviot
29e549d475 [expression_editor/poincare] Move Right in an ExpressionLayout.
Change-Id: Ib5f018666350d6bb061272ae7b04b6f721d50e84
2018-01-15 11:58:01 +01:00
Léa Saviot
78c02e6871 [expression_editor/poincare] Move Left in an ExpressionLayout.
Change-Id: Id69def65e0976bfb045c1da6e8786a2f5797120c
2018-01-15 11:58:01 +01:00
Léa Saviot
73810bbd9a [poincare] ExpressionLayout cursor.
Change-Id: I2367d20754189608a7925f0d8e8dfe361fed0fd0
2018-01-15 11:58:01 +01:00