Commit Graph

55 Commits

Author SHA1 Message Date
Léa Saviot
8d32930eae [poincare] Check equivalent positions when moving Up and Down
Change-Id: I5043d0a43c981592b0b72fd1221769497520b342
2018-04-20 11:34:02 +02:00
Léa Saviot
829cd06685 [poincare] Fix some layouts up/down navigation
Change-Id: I1a69651ca41899557489318fe4d4609e51308036
2018-04-20 11:30:22 +02:00
Léa Saviot
09db58d24c [poincare] Remove some parameters in ExpressionLayout::moveUp/Down
Change-Id: I406c02229aace0ec7417e5194d448023273fb3d0
2018-04-19 17:56:43 +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
ff03b6dfa3 [poincare] Fix the fraction line size
Change-Id: I69da69b53708093cd43c696bfb84691b53bc95aa
2018-04-18 16:34:40 +02:00
Léa Saviot
8b4cc7146e [poicare] isVerticalOffset method.
Change-Id: I8ddbfe2b14a495a691ad6b5cb3f615430dbe4846
2018-04-17 16:32:13 +02:00
Léa Saviot
193aefd5a6 [poincare] Each leayout gives the layoutToPointWhenInserting
Change-Id: I5f054643decd27731e77d0f1cf2e6874cf6ff8d5
2018-04-17 15:33:40 +02:00
Léa Saviot
e327c0bbf1 [poincare] Create Horizontal child layouts when collapsing.
Change-Id: I174aee72997c6ba895e7a17906802f6bd5e939d2
2018-04-17 14:05:37 +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
8d5b40c351 [poincare] Add collapseBrothers method on ExpressionLayout.
Change-Id: Ia4be10b42ae8db300ce1ce7029175a92a667c808
2018-04-17 14:05:37 +02:00
Léa Saviot
ba97e63580 [poincare] EmptyVisibleLayout becomes EmptyLayout.
Change-Id: I2e33cf32ced72e47c72d2793fcc6cd98aac4eb4d
2018-04-16 17:49:10 +02:00
Léa Saviot
ca53df8166 [poincare] Fix fraction to a power bug.
2/345  ^6 would give 2/(345^6)

Change-Id: I1eb0144f511b80ce98cb247de8497fb33153e94b
2018-04-16 12:00:23 +02:00
Léa Saviot
a6e6416e09 [poincare] Fix code typos
Change-Id: I02143e1b99d3cf2f4ced6954bf2e612542c01642
2018-04-10 18:03:40 +02:00
Léa Saviot
9f9692b009 [poincare] Add numberOfSignificantDigits arguent in writetextInBuffer
Change-Id: I1bef3462dbdfd94bff0af0e9d569d0ecf63d157c
2018-04-10 17:55:20 +02: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
8ffac8f69f [poincare] Fixed fraction serialization.
There was a problem with omitted multiplications: 1/2 3 would be
computed as 1/(2*3).

Change-Id: Ic8e7ebfaa525c8bbf910d7c93fb7a3ca770a2e44
2018-01-18 15:41:24 +01:00
Léa Saviot
6f8a1979d2 [poincare] Remove superfluous parentheses when serializing fractions.
Change-Id: I2f24d67293ed26fbe5aab3035c49ae162fdefab0
2018-01-16 17:29:21 +01:00
Léa Saviot
16fad9f9fb [poincare] Cleaned backspaceAtCursor for layouts.
Change-Id: I232fa7af24a9983d3acfb3460042cb32bfcef81f
2018-01-15 11:58:07 +01:00
Léa Saviot
1717b470c8 [poincare] When replacing a layout, ask the parent to move the cursor.
Change-Id: I0ddb0e791d328c2f141aefc604569ef4fcc6c0c5
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
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
98faf01b53 [poincare] Better Fraction collapsing.
Change-Id: Ic898f522ae26cfcd5917f4da85715f85a5861b9f
2018-01-15 11:58:05 +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
af2a572135 [poincare] Fix fraction delete.
Change-Id: I98d8fc4d835e753cca9138c42273fff43a58478c
2018-01-15 11:58:04 +01:00
Léa Saviot
527fd9feab [poincare] Fixed FractionLayout delete.
Change-Id: Idb8e5c4d71cf00c796a82ef1f41ea63b224752ba
2018-01-15 11:58:03 +01:00
Léa Saviot
2d40e35fe8 [poincare] Delete for FractionLayout.
Change-Id: Ifbbe5c434d278e8223ada3d368c1e948712567d2
2018-01-15 11:58:03 +01:00
Léa Saviot
693fb5e400 [poincare] Clean Layouts.
Do not compute the baseline at construction, and use base class
constructors.

Change-Id: I4361a6d92d7652b2aae2d662388b8d2c90afd3ce
2018-01-15 11:58:03 +01:00
Léa Saviot
241d37afa5 [poincare] Recompute baselines when needed.
Change-Id: I4ec717402a4dfd287aa95f45189e1734e4f5e3ed
2018-01-15 11:58:02 +01:00
Léa Saviot
82469ca96e [poincare] Added margins to ConjugateLayout.
Change-Id: I27b3788c87d36390fcea63c6a70b89aa36a2e9f3
2018-01-15 11:58:02 +01:00
Léa Saviot
0cc1d99a54 [poincare] Static and Dynamic Layout hierarchies.
Change-Id: I3b47dbd76552b77db762482932518a74c1996cc0
2018-01-15 11:58:01 +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
Émilie Feral
7ae6241acd [poincare] Fix all layouts: redefine baseline
Change-Id: Iff04bf9bee946050721fc095d1617586dc251d6b
2017-11-22 14:38:08 +01:00
Émilie Feral
20fd816dc8 [poincare] In fraction layout, add a margin around fraction line
Change-Id: I997b1c4219eafec0e17f3d64ea9335f2f90f2528
2017-08-17 16:21:22 +02:00
Émilie Feral
0abe51ccbb [poincare] In fraction layout, align fraction line to +/- symbols
Change-Id: I9528e9c5e6219a365adf7fbf8a0db163c618c7fe
2017-08-17 16:21:20 +02:00
Émilie Feral
5c4740913b [kandinsky] Replace KDText::stringSize(" ") by KDText::charSize()
Change-Id: Ie962d7784b54ff41431d21f64d9af0887a86f9b7
2017-08-17 16:21:17 +02:00
Émilie Feral
69e46f4958 [poincare] Namespace Poincare
Change-Id: I51a84fa7978ba16f128cfe1d32c390970f2037e8
2017-02-13 17:15:06 +01:00
Émilie Feral
9d0354f3bd [kandinsky] Add a default font size : large
Change-Id: I6b9f1a7b09292f120074c8957e328ddc33023c67
2017-01-27 12:03:06 +01:00
Émilie Feral
f51ae5db12 [kandinsky] Introduce two fonts: small font and large font
Change-Id: I502dfa88d627b09ac5af76155140af63547025cd
2017-01-27 11:14:01 +01:00
Émilie Feral
609e9798d2 [poincare] Change define constant in contexpr static
Change-Id: I6c0d10ab7503154ea516e3823224d150dc3db5d0
2016-12-08 17:10:36 +01:00
Émilie Feral
12d2b2311e [Kandinsky] Create inline method min and max
Change-Id: Ia3b3ef4373a9ac47d1612d3cf31a8c4d0c850e5a
2016-12-08 17:10:36 +01:00
Émilie Feral
bc00592571 [poincare] add color parameters when drawing expression
Change-Id: I69f2aba0c69bac92b7a6dd1e78bcb45602f87110
2016-09-30 17:36:38 +02:00
Romain Goyet
2e3b578eff [Poincare] Update for C++ Kandinsky
Change-Id: Ib0d44841245a290c0395c43b2cde4c7ea69c17ca
2016-08-19 10:34:59 +02:00
Felix Raimundo
5e01cfe421 Add baseline for pretty printing.
Change-Id: I77e76cb4b6191992137dd83f366006115ae65661
2016-03-29 13:41:37 +02:00
Felix Raimundo
3710103f40 Change the layout creation.
The father now sets itself as teh father of its children.
ExpressionLayout do not know anything about expressions now.

Change-Id: I28954c78f3102eec056ebbc3c52ccd862a5ab8fd
2016-03-25 14:35:00 +01:00
Felix Raimundo
12cf51d04e Some cleanup
Adds the poincare README.
Removes a useless include in poincare/include/poincare/fraction_layout.hpp

Change-Id: Id4e4625b69df5eac6b7d6a58cb91c7331a0f7205
2016-03-18 14:32:59 +01:00
Romain Goyet
54506e67db [poincare] Temporary fix for fraction bar drawing 2015-09-25 14:22:55 +02:00