OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
32,601 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

32601 Commits (2b155427bdd4290079fa8769c0b0d960e0924bd6)

Author SHA1 Message Date
RiotRobot 2b155427bd Merge branch 'master' into develop 2021-04-26 17:49:39 +01:00
RiotRobot 87e3ad303f v3.19.0 2021-04-26 17:47:10 +01:00
RiotRobot a6e790aa1d Prepare changelog for v3.19.0 2021-04-26 17:47:09 +01:00
RiotRobot a79b0e9327 Upgrade matrix-js-sdk to 10.0.0 2021-04-26 17:42:04 +01:00
J. Ryan Stinnett af14f83358
Merge pull request #5927 from matrix-org/jryans/image-view-zoom-release 
[Release] Dynamic max and min zoom in the new ImageView
 2021-04-26 17:27:05 +01:00
Šimon Brandner 9f1d17b1a2 i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:53:34 +01:00
Šimon Brandner e820d60cd4 Show zoom buttons only if zooming is enabled 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:53:34 +01:00
Šimon Brandner 9a04f029aa Fix spelling 2021-04-26 16:53:34 +01:00
Šimon Brandner 2f147c2e98 Change cursor to default 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:53:34 +01:00
Šimon Brandner 3716ec4a25 Try to precalculate the zoom from width and height props 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:53:34 +01:00
Šimon Brandner ebe3b36528 If the image is small don't scale 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:53:34 +01:00
Šimon Brandner 59bf542158 Fall back to natural height and width 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:53:34 +01:00
Šimon Brandner 95ea71a23a 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 16:53:34 +01:00
Šimon Brandner dcd625c7e3 Rework zooming 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:53:34 +01:00
Šimon Brandner bc62c6bec9 Fix zoom step and coeficient 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:53:34 +01:00
Šimon Brandner d0ba142b72 Add some comments 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:53:34 +01:00
Šimon Brandner 7e2a3e3c31 Use MAX_SCALE for maxZoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:53:34 +01:00
Šimon Brandner 52e2c136d7 Use correct cursor when we can't zoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:48:06 +01:00
Šimon Brandner 3ae0bc307c Remove logline 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:48:06 +01:00
Šimon Brandner 464ebe900d Get rid of onWindowResize() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:48:06 +01:00
Šimon Brandner 6a405fa8e8 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-26 16:48:06 +01:00
Šimon Brandner 0d2db0e83a Add dynamic maxZoom and wire it all up 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:48:06 +01:00
Šimon Brandner a1906be349 Initial code for dynamic minZoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 16:48:06 +01:00
J. Ryan Stinnett 9401a6d6dc
Merge pull request #5916 from SimonBrandner/image-view-zoom 
Dynamic max and min zoom in the new ImageView
 2021-04-26 15:46:26 +01:00
Travis Ralston ddb8947c15
Merge pull request #5897 from matrix-org/travis/error-states 
Improve message error states
 2021-04-26 08:16:26 -06:00
Š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
J. Ryan Stinnett dda18c9384
Merge pull request #5914 from matrix-org/jryans/forget-room-error 
Check for null room in `VisibilityProvider`
 2021-04-26 10:36:21 +01: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 49f5f89351 Give a bit of opacity to the divider colour 2021-04-23 16:04:53 -06:00
Travis Ralston 82119ad595 Merge branch 'develop' into travis/error-states 2021-04-23 15:53:37 -06: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