Léa Saviot
dadcd83924
[poincare] Remove uses of outdated layouts, such as StringLayout.
...
Change-Id: I55bb846371c224f8f2e739b759725b0e02759ebd
2018-01-15 11:58:05 +01:00
Léa Saviot
55044d8e0b
[poincare] Update Expression's privateCreateLayout().
...
We use the new layouts and no longer the old ones such as StringLayout
or BaselineRelativeLayout.
Change-Id: Ic15167b694c3adab46f348c8f823ce19b3e5ef33
2018-01-15 11:58:05 +01:00
Léa Saviot
83bd562fb8
[poincare] Fixed IntegralLayout serialization.
...
The integrand was not properly written.
Change-Id: I063ed0ee58986174a374cc6b06b49bd5ec4a4d7d
2018-01-15 11:58:05 +01:00
Léa Saviot
41310a4ecf
[poincare] "Hard draw" the fixed parentheses in SequenceLayout.
...
Change-Id: Id626c85a7db540148bf9cb05ddb968c3f807454f
2018-01-15 11:58:05 +01:00
Léa Saviot
4cc107b15f
[poincare] "Hard draw" n= in SequenceLayout, instead of layouting it.
...
Change-Id: I79aa6ab0f46c0a05a3c2fe1dd88b287dc09dac17
2018-01-15 11:58:05 +01:00
Léa Saviot
4478885566
[poincare] "Hard draw" dx in IntegralLayout, instead of layouting it.
...
This simplifies the navigation, edition and serialization of
IntegralLayout.
Change-Id: I03360bf83eeb0cbd9524c992518dff125900e9a5
2018-01-15 11:58:05 +01:00
Léa Saviot
7c3b97fe36
[poincare] Fixed fraction deletion.
...
There was a problem with the new cursor position.
Change-Id: Iac163e236b45b776fc98bdef75e2abc5d13c2b18
2018-01-15 11:58:05 +01:00
Léa Saviot
48dc38da56
[poincare] Fixed "dx" removal when deleting an IntegralLayout.
...
Change-Id: I65494adf8d5bc732e95270ed6397b49a5303e7b0
2018-01-15 11:58:05 +01:00
Léa Saviot
bfe4735199
[poincare] Fix bug when replacing child in Horizontal layout.
...
Change-Id: I99b6e32932db27376c83eafe1a4ff5044b1d3334
2018-01-15 11:58:05 +01:00
Léa Saviot
23eccd2c75
[poincare] Cleaned the dynamic methods for layouts.
...
Change-Id: I17db05b01c75a638a56fe2c197a175fd1b04840d
2018-01-15 11:58:05 +01:00
Léa Saviot
211227e682
[poincare] Changed NthRootLayout deleting.
...
Before, nested roots did not get deleted properly.
Change-Id: I1d3dce28912a4843a372db8c3a0b479bd11b27f9
2018-01-15 11:58:05 +01:00
Léa Saviot
a998ae4541
[poincare] Fixed parenthesis baseline computing.
...
Change-Id: I38ecb8bab67280f6e452bc9ef404a00641060879
2018-01-15 11:58:05 +01:00
Léa Saviot
21ed3471b1
[poincare] Fixed parenthesis height computing.
...
Before, it did not take the baseline into account.
Change-Id: Ib1b220d7c07eab7002497671e9c6ffba8548acfb
2018-01-15 11:58:05 +01:00
Léa Saviot
0f5019442f
[poincare] Fixed parenthesis collapsing bug.
...
Pressing "(", "1", "/" collapsed the parenthesis.
Change-Id: Iebd8925c1e8518013f0e0aa9a45bb42881583640
2018-01-15 11:58:05 +01:00
Léa Saviot
e8560f7b97
[poincare] Fixed coding style.
...
Change-Id: Ic57dfd53a3ae70cf71be08b73935c9f7649c2b76
2018-01-15 11:58:05 +01:00
Léa Saviot
65d7fd7a01
[poincare] Added comment to explain baselines.
...
Change-Id: I769c55c48c80bdce6deb8a7fc23ccc36bdc398a9
2018-01-15 11:58:05 +01:00
Léa Saviot
98faf01b53
[poincare] Better Fraction collapsing.
...
Change-Id: Ic898f522ae26cfcd5917f4da85715f85a5861b9f
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
4009a0d879
[poincare] VerticalOffsetLayout and mustHaveLeftBrother() for Layouts.
...
Change-Id: Ibd4666806bb0af2a2babe892c8a9906747c18e9a
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
89760c0f42
[poincare] isCollapsable() for ExpressionLayouts.
...
Tells whether the layout should be collapsed into the numerator (or
denominator) of a new FractionLayout brother.
Change-Id: Id5c2a55667bec56340d73c2a63dc704fa56c9815
2018-01-15 11:58:04 +01:00
Léa Saviot
62ffb42472
[poincare] Fixed invalidation of layout baseline and position.
...
When adding, replacing or detaching a child.
Change-Id: I3ef212fbe270cee8d0e3a11402cc6df1228ee8d5
2018-01-15 11:58:04 +01:00
Léa Saviot
4fa64d837a
[poincare] Parser rule for function_{args1}(args2).
...
It is parsed as function(args2 concatenated with args1).
Change-Id: I478cf7b34c6f49e5d258fe8f6af823a7d7b5941e
2018-01-15 11:58:04 +01:00
Léa Saviot
1ced6e2360
[poincare] Empty ListData constructor.
...
Change-Id: I882eb664d74399ab87ef9bd95bc1b255f5a5f87c
2018-01-15 11:58:04 +01:00
Léa Saviot
b4358ab99a
[poincare] Changed assert condition in LayoutEngine.
...
The function writeInfixExpressionOrExpressionLayoutTextInBuffer is now
used by HorizontalLayout, which might have only 1 argument.
Change-Id: Ic22baa4c43847fe1fd4a38e3180b4ae8bef18d19
2018-01-15 11:58:04 +01:00
Léa Saviot
57dcf24675
[poincare] Changed names in StaticLayoutHierarchy::build.
...
For debugging purposes.
Change-Id: I10185978cbc590ba0016516e151ecba852bd4d72
2018-01-15 11:58:04 +01:00
Léa Saviot
8e30d10e43
[poincare] Changed the arguments order for Sequence layouts.
...
Change-Id: I83c535c5d3e1d263343ab7f656b5c22c82049ad4
2018-01-15 11:58:04 +01:00
Léa Saviot
3fe7295f6c
[poincare] ExpressionLayoutArray was a method, it is now a class.
...
Change-Id: Iddde7ed9d8a8539193c6547a9e718865ff8e8cc7
2018-01-15 11:58:04 +01:00
Léa Saviot
5107343a44
[ExpressionEditor] Handle EXE events: show serialized layout.
...
Change-Id: I19be0ab5263cba42caca2ca71fe0082f3339e473
2018-01-15 11:58:04 +01:00
Léa Saviot
332cfb013f
[ExpressionEditor] TextView to see serialization results.
...
Just for development purposes.
Change-Id: I8700818a8d5705e2c610bd448fbcc2deea6b9971
2018-01-15 11:58:04 +01:00
Léa Saviot
ccd25a360d
[poincare] Serialize expression layout.
...
We can now convert layouts into text: we will be able to parse them
into an Expression.
Change-Id: I82f4834c08f5b2c5fb294bdcb9a49257b574e20b
2018-01-15 11:58:04 +01:00
Léa Saviot
1773dcbc34
[poincare] Fixed cases where baseline was used without computing it before.
...
To access a layout's baseline, we should always use baseline() instead
of m_baseline, in order to compute the baseline if it needs to be computed.
Change-Id: I5e859108bb30b7e23e09beb82fe7046bfa25414f
2018-01-15 11:58:04 +01:00
Léa Saviot
af2a572135
[poincare] Fix fraction delete.
...
Change-Id: I98d8fc4d835e753cca9138c42273fff43a58478c
2018-01-15 11:58:04 +01:00
Léa Saviot
ceb1243357
[poincare] Fix integral layout navigation.
...
Change-Id: Id8e733dfc1c0e5c583a0d3e33ab4c0837c08e782
2018-01-15 11:58:04 +01:00
Léa Saviot
894e8a6032
[poincare] Fix main layout edition.
...
If its only child is empty, remove it before adding another child.
Change-Id: I3047f17c69ff14787e172d99b6e0b3e1f4096f26
2018-01-15 11:58:04 +01:00
Léa Saviot
2c5e1b99bb
[poincare] Parameter for UneditableHorizontalTrioLayout navigation.
...
This parameter specifies if the cursor can be left and right of the
layout.
Change-Id: Ia8d5ff45a471e964bf82e8db0465a5f07661884d
2018-01-15 11:58:04 +01:00
Léa Saviot
47f691c997
[expression_editor] Empty initial layout.
...
Change-Id: I00231be393bf65715f8f8647439c344fe7069851
2018-01-15 11:58:04 +01:00
Léa Saviot
22b0042ded
[poincare] Delete for UneditableHorizontalTrioLayout.
...
Change-Id: Ide310278ed9444cf03dc02dc40c391ff9f3dfd16
2018-01-15 11:58:04 +01:00
Léa Saviot
44cf9e8979
[poincare] Delete for StringLayout.
...
Change-Id: I67ff432cb283ae2cd1d1acd86a0e2baef9dcbe29
2018-01-15 11:58:04 +01:00
Léa Saviot
af232a8678
[poincare] Delete in SequenceLayout.
...
Change-Id: Ie530516fcddde4d7a93d89993bab5cab30927faa
2018-01-15 11:58:04 +01:00
Léa Saviot
df77faec28
[poincare] Delete for RootLayout.
...
Change-Id: I4555e94bfa887e63aa0a3e11eff8f3043b5803e7
2018-01-15 11:58:04 +01:00
Léa Saviot
2a3dc0a83a
[poincare] Delete for integral layouts.
...
Change-Id: I830b759108f857825a576d1dc37b2f85add7688a
2018-01-15 11:58:04 +01:00
Léa Saviot
30b75bfef6
[poincare] Delete for EmptyVisibleLayout.
...
Change-Id: Iceda680d153ddf622a39a4f46274ce038401ca61
2018-01-15 11:58:03 +01:00
Léa Saviot
527fd9feab
[poincare] Fixed FractionLayout delete.
...
Change-Id: Idb8e5c4d71cf00c796a82ef1f41ea63b224752ba
2018-01-15 11:58:03 +01:00
Léa Saviot
5d229b2ab0
[poincare] Fixed StringLayout navigation.
...
Change-Id: Ib89cf550bb22c3216db6364566d5b08abe9d3889
2018-01-15 11:58:03 +01:00
Léa Saviot
abdd85ddff
[poincare] Delete for BaselineRelativeLayout (Editable or not).
...
Change-Id: I86fb27c35859d742ff26f55397281c2585960b08
2018-01-15 11:58:03 +01:00
Léa Saviot
3415dde6c7
[poincare] Use uneditableHorizontalTrioLayout in SumLayout.
...
Change-Id: I67c5c59d8cdb50506a105dd0929eaa1bc79bca1c
2018-01-15 11:58:03 +01:00
Léa Saviot
3baf483a86
[poincare] Fixed StringLayout navigation bug.
...
Change-Id: I73b99b6a4302b4487357a7e1cef563b43743554c
2018-01-15 11:58:03 +01:00
Léa Saviot
48e20abe73
[poincare] Navigation and delete in GridLayout.
...
Change-Id: I8357150d9f15dd003ab97e09981d164d57235739
2018-01-15 11:58:03 +01:00