Commit graph

32560 commits

Author SHA1 Message Date
Šimon Brandner
38566a3644
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 15:51:56 +02:00
Šimon Brandner
1fcad1a634
Show zoom buttons only if zooming is enabled
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 15:47:58 +02:00
Šimon Brandner
53e8b5e6af
Merge branch 'image-view-zoom' of https://github.com/SimonBrandner/matrix-react-sdk into image-view-zoom 2021-04-26 15:01:47 +02:00
Šimon Brandner
3547d1f93b
Change cursor to default
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 15:01:06 +02:00
Šimon Brandner
e374fcfe91
Fix spelling 2021-04-26 13:49:29 +02:00
Šimon Brandner
dbca370497
Try to precalculate the zoom from width and height props
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 13:48:14 +02:00
Šimon Brandner
b741b3112a
If the image is small don't scale
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 13:47:06 +02:00
Šimon Brandner
33107a1f47
Fall back to natural height and width
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 13:30:14 +02:00
Šimon Brandner
c1a4204ad3
Use a ref instead of that ugly thing
Sometimes I do really weird things and don't know why :D

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 13:11:41 +02:00
Šimon Brandner
0e312977e3
Rework zooming
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 10:36:53 +02:00
Šimon Brandner
90f2423eb7
Fix zoom step and coeficient
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 10:35:25 +02:00
Šimon Brandner
bcc6e5c5d5
Add some comments
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 09:41:46 +02:00
Šimon Brandner
9b7a9fc865
Use MAX_SCALE for maxZoom
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 09:24:25 +02:00
Šimon Brandner
1a906c95da
Merge branch 'develop' into image-view-zoom 2021-04-24 09:14:30 +02:00
Šimon Brandner
dcc060f6f7
Use correct cursor when we can't zoom
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 09:00:15 +02:00
Šimon Brandner
e0e9ccbf95
Remove logline
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 08:38:13 +02:00
Šimon Brandner
57b34f8dbc
Get rid of onWindowResize()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 08:37:51 +02:00
Šimon Brandner
f8af9831a9
Don't use percanteages
I was an idiot to use them in the first place

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 08:35:45 +02:00
Šimon Brandner
4523b8c7b8
Add dynamic maxZoom and wire it all up
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 08:32:28 +02:00
Šimon Brandner
dad7a22055
Initial code for dynamic minZoom
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 08:03:39 +02:00
Travis Ralston
09af2a8891
Merge pull request #5910 from matrix-org/travis/tests/array-obj-utils
Add unit tests for various collection-based utility functions
2021-04-23 11:21:12 -06:00
Michael Telatynski
e088118650
Merge pull request #5909 from robintown/spaces-visual-fixes
Spaces visual fixes
2021-04-23 17:54:30 +01:00
Robin Townsend
002c24ebeb Merge branch 'develop' into spaces-visual-fixes 2021-04-23 10:43:40 -04:00
Robin Townsend
3d7842d696 Remove old FormButton CSS
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-23 10:25:04 -04:00
Robin Townsend
0f84b3dff3 Align checkboxes with names in add rooms to space dialog
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-23 10:25:04 -04:00
Robin Townsend
024cf7f66c Cut off long names in add rooms to space dialog
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-23 10:24:50 -04:00
Germain
65d55bd0d9
Merge pull request #5908 from matrix-org/gsouquet-messagepreview-nodom
Remove reliance on DOM API to generated message preview
2021-04-23 14:37:19 +01:00
J. Ryan Stinnett
c09d4f4a78
Merge pull request #5904 from SimonBrandner/normalize-wheel
Add a WheelEvent normalization function
2021-04-23 12:59:37 +01:00
Travis Ralston
2c459c4828 Move utility tests to the right place 2021-04-22 20:37:19 -06:00
Travis Ralston
374f51452e Add set utility tests 2021-04-22 20:37:19 -06:00
Travis Ralston
27af3291ed Add number utility tests 2021-04-22 20:37:19 -06:00
Travis Ralston
6124a8319b Add iterable utility tests
Unsurprisingly, it's a copy/paste of the array tests
2021-04-22 20:37:19 -06:00
Travis Ralston
0d4218ee35 Add enum utility tests 2021-04-22 20:37:19 -06:00
Travis Ralston
21cae1502a Add map utility tests 2021-04-22 20:37:19 -06:00
Travis Ralston
772ff4e257 Add object utility tests 2021-04-22 20:37:19 -06:00
Travis Ralston
a3e846685d Add array utility tests (and support upsampling in resample)
See contained diff. 

The upsampling is important for Voice Messages, but is being done here because it's easier to add all the tests at once.

This also introduces a new Object utility - that will be tested on its own commit.
2021-04-22 20:08:45 -06:00
Travis Ralston
06726d38fe
Merge pull request #5888 from matrix-org/travis/voice/event_type
Expand upon voice message event & include overall waveform
2021-04-22 14:41:59 -06:00
Robin Townsend
cc5a7671a7 Keep invite button separate from space info
60828913d2 caused the space info and
invite buttons to have no separation when you are the only person in a
space, since the margin was set on the face pile, which may be absent.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-22 11:39:58 -04:00
Germain Souquet
2b6551d06a Remove reliance on DOM API to generated message preview 2021-04-22 16:17:53 +01:00
Travis Ralston
14809dfda7 Misc cleanup 2021-04-22 08:22:31 -06:00
J. Ryan Stinnett
21e7847686
Merge pull request #5905 from matrix-org/jryans/image-bg-opacity
Use floats for image background opacity
2021-04-22 15:01:48 +01:00
Michael Telatynski
ba9cfa0942
Merge pull request #5902 from matrix-org/t3chguy/fix/17020
Show invites to spaces at the top of the space panel
2021-04-22 14:32:48 +01:00
Michael Telatynski
3fb4b6258a
Merge pull request #5899 from matrix-org/t3chguy/spaces-stability
Improve edge cases with spaces context switching
2021-04-22 14:30:35 +01:00
Michael Telatynski
5c93b99ec6
Merge pull request #5900 from matrix-org/t3chguy/fix/17024
Fix spaces notification dots wrongly including upgraded (hidden) rooms
2021-04-22 14:30:20 +01:00
J. Ryan Stinnett
b332f6b1ae Use floats for image background opacity
It seems percentages for opacity are still newish, and they seem to confuse
something which is clamping them to the 0 - 1 range (which makes sense for
floats, not percentages).

Anyway, for now we can get what we want here by using float values.

Fixes https://github.com/vector-im/element-web/issues/17036
2021-04-22 14:04:15 +01:00
Šimon Brandner
2e6397d8aa
Wire up normalizeWheelEvent()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-22 14:56:35 +02:00
Šimon Brandner
ad53b0e2e2
Add normalizeWheelEvent()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-22 14:56:12 +02:00
Michael Telatynski
e219fe082a Tweak context switching edge case for space invites 2021-04-22 12:08:54 +01:00
Michael Telatynski
e05200269f fix comment 2021-04-22 12:07:58 +01:00
Michael Telatynski
108a3088ef Hide explore rooms quick action when active space is an invite 2021-04-22 12:07:58 +01:00