Commit graph

16011 commits

Author SHA1 Message Date
Andreas-Kainz
f50a2c2011 Sidebar css fixes
1. add css class for selected and hover unocommands

Signed-off-by: Andreas-Kainz <kainz.a@gmail.com>
Change-Id: Id89467355e029c7ff5c2f05d1c70fe064b166422
2021-08-11 22:42:24 +02:00
Michael Meeks
7b89840798 docker: only substitute variables when they are set.
Clobbering a copied-in config un-necessarily is impolite.

Change-Id: I9eec5711d12def987f2ae08f9e6bd77f1636780e
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2021-08-10 20:40:22 +01:00
Michael Meeks
af4dc35041 Configuration - clarify various key settings.
Also add link to SDK documentation.

Change-Id: Ib58a295fb96c4198906653bfe3a1c29d2ae6346b
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2021-08-10 20:40:21 +01:00
Michael Meeks
8ad5e962d7 Discourage accidental proxy_prefix fiddling.
Change-Id: I12e2ba227113eddf5bad1db192a87e22baa325d1
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2021-08-10 20:40:21 +01:00
Dennis Francis
901690f696 move the drawingEnabler code to CalcTileLayer
Conflicts:
	loleaflet/src/layer/tile/TileLayer.js

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I2493c2b9a336dd531ef50031c723670e2a432fc6
(cherry picked from commit a4fa99047fc1a9dde312396de15bb18954e2efb0)
2021-08-10 14:43:25 +05:30
Dennis Francis
bc51d2eb6c fix black bg on canvas paused since construction
Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I833f705077008e4231052f5edb34db39a81445bc
(cherry picked from commit 92322f83dc89a0d1eefcf6dd3dff697aaa7cd303)
2021-08-10 14:43:25 +05:30
Dennis Francis
136df685e0 calc: pause rendering till we get first cell cursor
Due to the necessity of long running render pause during document load,
we need to introduce a drawingEnabled state variable in
section-container class that works correctly with the exisiting
pause-resume functionality but with a higher priority.

It is possible to implement this functionality using the existing
drawingPaused counter using some Infinity magic, but it seemed to make
the code rather complex.

Conflicts:
	loleaflet/src/layer/tile/CanvasSectionContainer.ts
	loleaflet/src/layer/tile/TileLayer.js

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I1aec49df93f24eb9239956071f1fc751b076f27d
(cherry picked from commit 09e7cee0b4355c0980ad41f3f74ff86b09334abf)
2021-08-10 14:43:25 +05:30
Dennis Francis
511a47fbe2 calc: do not request/show default view area tiles before...
we get the cell cursor position from core which determines the final
view area. If we do on document load the default view starting at A1 is
displayed for a short time and after getting the cursor position, new
tiles are requested for the new view area and are displayed. This is
also perceived as a flicker on load.

Also request the cell cursor position early during the addition of
CalcTileLayer to map.

Conflicts:
	loleaflet/src/layer/tile/TileLayer.js

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I0996b75ed120a59a242cb50991d90afd228d3582
(cherry picked from commit 55328b64225e7878f1e5c89edd8e7cbabf236633)
2021-08-10 14:43:25 +05:30
Rash419
526b32bb98 loleaflet: added recent color section in colorPicker
cypress: updated the test with respect to changes

Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I31c5d93260551986d43722ab606c4b9eee1de913
2021-08-10 09:41:54 +02:00
Pedro Pinto Silva
edcc5b0faa Calc: Help: Add Navigational shortcuts
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I3117d6137e2ec6a7a544fcb4cecf1ef4aa543b85
2021-08-10 09:13:05 +02:00
Dennis Francis
2a02076081 zoom-animation: avoid drawing page borders and number
These are intended for when we are scrolling fast and we have
no tiles to display on upcoming pages. Anyway while zoom is changing
the for some reason page border drawn is wrong (has an offset).

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I6101423012c25c955de64c4061b31c29416a6f9d
2021-08-10 12:00:05 +05:30
Dennis Francis
7ca5383c5f zoomanimation: offscreen canvas bg must match document bg color
Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: Ic6c1a30bd5c43a4a4782d25f48f5080dca5866df
(cherry picked from commit fe4b0fe1c0ae47feb8fdf64f15f8b7facd819fb9)
2021-08-10 12:00:05 +05:30
Dennis Francis
448b3a9966 do not animate zoom in a cypress test
Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: Ifd61a368ca93e7d3b84498748b70335312f797b0
(cherry picked from commit 2623967f37db5089867a7166d334f299120d1e8a)
2021-08-10 12:00:05 +05:30
Dennis Francis
e279e4be87 fix: missing zoom-animation for Draw
Conflicts:
	loleaflet/src/layer/tile/TilesSection.ts

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I260a5bf08751087edad9abfeaa2a68c4c7ac914e
(cherry picked from commit bae749a85a3b22c8cdc3da052aeb2298e6fc37ec)
2021-08-10 12:00:05 +05:30
Dennis Francis
04c11fef54 we do not need margin clearing anymore
to avoid tile remnants as we clear tile section as we have the tiles for
the new zoom in batched mode (due to msg-slurping).

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I6f6e5b5f121f7dce060e6e3ac2ed9d0d586efbfa
(cherry picked from commit 040bb40fdd5396be6d93d86ad405f62985720022)
2021-08-10 12:00:05 +05:30
Dennis Francis
aca3458736 Restrict animation to user triggered zooming
Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I55d583c58346a8af705cc507e7bc7ced717dc052
(cherry picked from commit ec384e74ed7c1f2530bbf4f0385543d433d4f5eb)
2021-08-10 12:00:05 +05:30
Dennis Francis
b70aa8cd41 zoom-animation: account for top margin as well if any
Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: If2f771b964d9960108b5eccb235a4c9849ab24ec
(cherry picked from commit a916313bccc6e3d772571d748621d65f967f39eb)
2021-08-10 12:00:05 +05:30
Dennis Francis
90653ee8b5 zoom-animation: fix the virtual pinch-center for margins
Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: Iea995082ad8eef8f712eee774d2631ddef193fb3
(cherry picked from commit 5d897931762183632a98ec3bb6867f69d11d618b)
2021-08-10 12:00:05 +05:30
Dennis Francis
8535a61759 zoom-animation: apply previous fix to overlay section
Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I0eca354850b5efe975283a44dca64f8f1fb40e12
(cherry picked from commit 34058ec34e9afba0f8f01d0baf358a91ccc9ce8b)
2021-08-10 12:00:05 +05:30
Dennis Francis
18536206f5 zoom-animation: fix frame bounds calc with margins...
Non calc apps have page margins which should also be included while
calculating the current frame's bounds. Otherwise we draw the marginless
document to the tiles section from the offscreen canvas.

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I0fc1975920b6abb6c0253dd7a04b800a8ae89867
(cherry picked from commit 96f6e9433463491e84a36cf23227bf2106de9b4d)
2021-08-10 12:00:05 +05:30
Dennis Francis
449d076988 Enable desktop zoom-animation for non-Calc apps
Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I2ebee4c53ab60e8c6cf61e392f5e0685110abb8b
(cherry picked from commit 199af73b6ddb78f6ea3ce12c4e8dc4bb42b6ee37)
2021-08-10 12:00:05 +05:30
Dennis Francis
76e7c501d9 desktop mode zoom animation for Calc
Reuse the pinch-zoom for mobile implementation for this.

Conflicts:
	loleaflet/src/layer/tile/CanvasTileLayer.js
	loleaflet/src/map/Map.js
	loleaflet/src/map/handler/Map.TouchGesture.js

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: Ic7c50708a3071f4661c996dd2aae7083feed64da
(cherry picked from commit 202fd1a3bfef22549e3402dcb7b6d9fad9b4f07d)
2021-08-10 12:00:05 +05:30
Dennis Francis
b9d3815d07 selection type is text if search-input is in focus
Conflicts:
	loleaflet/src/layer/tile/TileLayer.js

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: Idb4685257ea03b09d4e77c9bf04d3009f8d60e2a
(cherry picked from commit bbd8955a4eb6234c520233d619a361f2937b09b2)
2021-08-10 11:16:06 +05:30
Dennis Francis
1a46324e2a overlay: redefine render order based on viewId/groupType
Conflicts:
	loleaflet/src/layer/tile/TileLayer.js

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: Ia51699f8b5619c4169a45312ee0c3b826fac9d0e
(cherry picked from commit 1eaa46b1e93247652778293e5594bc109769364b)
2021-08-10 11:16:06 +05:30
Dennis Francis
ff1a5a6ed3 separate the styling of cell and text selections
We now have a very specific design for cell-area selections which
involves many paths. However we don't need the same styling for text
selections. Use a simple CPolygon based drawing for text-selections till
we come up with a better styling for them.

Conflicts:
	loleaflet/src/layer/tile/GridLayer.js
	loleaflet/src/layer/tile/TileLayer.js

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: Ieed0ff688e1333aa8d7c8ddd923933d49855c130
(cherry picked from commit a929a2a5d34a3f6438466e105a9cbff5e426272e)
2021-08-10 11:16:06 +05:30
Dennis Francis
cf568f8992 improve styling of cursor/selection/autofill-marker
* Autofillmaker should follow the grid (not go overboard as it is now)
* Add one white border to the selection (but very discreet, 1 pixel)
* The autofillmarker, selected outline and cell cursor should share the
  same color. That color should come from css var (so it fits better
  with surrounding elements, cell headers etc).

Caveats:

* Autofill-marker in mobile devices was positioned and sized
  differently. With this change, they stay the same except for the color
  and the contrast border. Styling this needs more thought.

Conflicts:
	loleaflet/css/loleaflet.css
	loleaflet/src/layer/tile/TileLayer.js

Signed-off-by: Dennis Francis <dennis.francis@collabora.com>
Change-Id: I64c2baa43a6f13ecd29266a5fd96eb3f53d00215
(cherry picked from commit e1a16d56681935758369c3b86a11a549de87de34)
2021-08-10 11:16:06 +05:30
Andreas-Kainz
25c8d8b528 Sidebar: expander with is 290px (322px - 2x16px)
Signed-off-by: Andreas-Kainz <kainz.a@gmail.com>
Change-Id: Ic562deb5f338540cfc0840cfc0b9506b8efdc495
2021-08-07 00:02:21 +02:00
Henry Castro
7972485509 loleaflet: simplify logException
Change-Id: I31bc41ba519f3bd5e5b873a836f6c8ed5bd842d5
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-08-06 16:19:27 -04:00
Henry Castro
f915df9fd5 loleaflet: restore log2 function
console.logException is used only for debugging
purposes

Change-Id: I7d761d0cd7b55c820b7b7dea4079dae0f6d09043
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-08-06 16:18:32 -04:00
Pedro Pinto Silva
503c801eb2 Feedback: Do now show dialog if welcome is present
- Do not bother user with multiple dialog at the loading time
- Add additional timer after the welcome dialog is closed before
calling feedback again

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ib432e13205b1b3bef4dfa7ed8752a6561a4f0466
2021-08-06 17:21:18 +02:00
Pedro Pinto Silva
07bb8dbad6 Feedback: Fix timer value
Increase timer value which avoids
user being prompted immediately after opening the app

to do---------
Nevertheless an additional commit should be implemented: If in presence
of a shouldWelcome() instance do not show
feedback dialog until user closes it
  - Upon closing it Feedback dialog should not be shown instantly
	, instead it should start a new timer and then show it.

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I47f980fc4e86a480f70337c685cc639d78be4509
2021-08-06 17:21:18 +02:00
Pedro Pinto Silva
668cbbb608 Feedback: passing WSD hash
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I8a61e3aeef5605c751cd6a70f808a97e102dee5a
2021-08-06 17:21:18 +02:00
Henry Castro
6f92adb8d3 loleaflet: prefix 'feedback-' messages
In order to not conflict with other
registered listeners.

Change-Id: I2fa15f4d5a04f0365ae4e940afa847dcb6e375cd
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-08-06 17:21:18 +02:00
Pedro Pinto Silva
9b9eb54dd3 Add Feedback: only if feebackLocation is defined and not empty
To ensure that feedback dialog is not shown for builds where
it's not supposed to appear. This is just a cautionary measure since
Map.Feedback.js is included only when feedback is enabled

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I378361d644dd76666ae3339a3d4f697a0a032e5f
2021-08-06 17:21:18 +02:00
Henry Castro
67bbb9b9c9 loleaflet: fix variable "feebackLocation"
Define the "feedbackLocation" variable only if it is enabled

Change-Id: I75ab9eec9f2f074eefe8551e876bb7dc07a30b4c
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-08-06 17:21:18 +02:00
Pedro Pinto Silva
3112c1acdd Feedback: Use proper location properties and pass isMobile
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ic1e46c1722efa416d7fffb55cbf71e5efa9e9a31
2021-08-06 17:21:18 +02:00
Pedro Pinto Silva
a1c0a9e43d Feedback: Add mobile layout and fix desktop dialog position
- Desktop: Do not rely on margin to position dialog instead,
use percentage to find the center of the screen and account
for dialog width in that.
- Mobile:
  - Add layout, styles, fonts etc
	- Fix containers and wrapper dimensions

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I7e2bf9d7ed015ea7ec96c3c36213802276e7f778
2021-08-06 17:21:18 +02:00
Pedro Pinto Silva
f571972d98 Feedback: Passing CSS Var as hash and fix height
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: Ic15d30d4bccab4ff8b75e51b106d35021b0c4ac8
2021-08-06 17:21:18 +02:00
Henry Castro
57d454436b wsd: fix url redirect
Signed-off-by: Henry Castro <hcastro@collabora.com>
Change-Id: I09fda6618c35147b12f8e25204290a7d61cd766b
2021-08-06 17:21:18 +02:00
Pedro Pinto Silva
7b1969f4ac Feedback: Style iframe
- Following the same style as the other dialogs
- Pass cssvar via url

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I7ef0b9e0249939028163b6bf93f7083636f1dd1e
2021-08-06 17:21:18 +02:00
Henry Castro
9266fa5793 add option --with-feedback-location
Change-Id: I2f5b1556f0b976e9c3cb1f78383d2d05e6aef892
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-08-06 17:21:18 +02:00
Henry Castro
c807f00442 loleaflet: handle iframe load error
Change-Id: I4b375cbafd0b89877066719004f0668b3ea86cd5
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-08-06 17:21:18 +02:00
Henry Castro
8a9345e871 loleaflet: add feedback handler
Change-Id: I8ef2c1afe4093e9ee867cd3130c82cbd93362eb9
Signed-off-by: Henry Castro <hcastro@collabora.com>
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
2021-08-06 17:21:18 +02:00
Henry Castro
22f06b6a5b loleaflet: add initial iframe dialog
Change-Id: If97f4ec39e1daac7eefc221bb222979de544a260
Signed-off-by: Henry Castro <hcastro@collabora.com>
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
2021-08-06 17:21:18 +02:00
Henry Castro
c8e2d25d24 add initial feedback option
Change-Id: I9357f556474e5ada881e27983c95f7527b284efc
Signed-off-by: Henry Castro <hcastro@collabora.com>
2021-08-06 17:21:18 +02:00
Pranam Lashkari
af54c49538 freemium: added missing freemium bits for the mobile bottom bar
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I643e6e6373643798df3e875ee696b4fb56bcfa8c
2021-08-06 17:21:04 +02:00
Pranam Lashkari
dcd6795e57 use pragma instead of header guards in freemium header files
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I5b55c2de4a2467503108e4172de84a27e207ba3c
2021-08-06 17:21:04 +02:00
Andras Timar
24214ef955 Android: add common/Freemium.cpp to CMakeLists.txt.in
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ibdfe445d0085fe26f74655a265cb2e9208157f7b
2021-08-06 17:21:04 +02:00
Pranam Lashkari
a7b7118b39 cypress: fixed broken mobile annotation tests
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I9d467a0d35c7e57e3737c8175537f9dddcdaad1e
2021-08-06 17:21:04 +02:00
Pedro Pinto Silva
001acdb8c0 Freemium: Mobile: Fix overlay on primary buttons
Does not need to be a badge in this particular case since it's above
a physical primary button; also make it completely white to be consistent
with the button's theme.

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I8c85fbe33d1b3897f0fddd44dd7a5d0517f92e93
2021-08-06 17:21:04 +02:00