Commit Graph

9691 Commits

Author SHA1 Message Date
Š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
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
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
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
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
Šimon Brandner
2e6397d8aa Wire up normalizeWheelEvent()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-22 14:56:35 +02: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
Michael Telatynski
a51aeaa04d Disable context menu on space invite tiles as no options sensibly work 2021-04-22 12:07:58 +01:00
Michael Telatynski
7efd4a43a5 Show space invites at the top of the space panel 2021-04-22 12:07:58 +01:00
Michael Telatynski
23c61752cd Add comment 2021-04-22 09:08:25 +01:00
Michael Telatynski
60828913d2 Iterate the spaces face pile design 2021-04-22 08:13:03 +01:00
Germain
68fb9a78c4 Merge pull request #5874 from matrix-org/gsouquet-room-events 2021-04-21 09:09:01 +01:00
Germain
9d2833c74b Merge pull request #5884 from matrix-org/gsouquet-jitsi-logout 2021-04-20 09:16:10 +01:00
Michael Telatynski
63ed9c271b Merge pull request #5866 from ColonisationCaptain/develop
Add missing space in seshat dialog and the corresponding string
2021-04-20 09:02:53 +01:00
Travis Ralston
4f75e2944c Appease the linter 2021-04-19 23:11:41 -06:00
Travis Ralston
61730f2f88 Populate waveform data on voice message event 2021-04-19 23:05:53 -06:00
Travis Ralston
6f794cca9b Fill in some metadata for the sent event 2021-04-19 21:01:48 -06:00
Germain Souquet
33eebb84a6 Ensure PersistedElement are unmounted on application logout 2021-04-19 17:57:20 +01:00
Michael Telatynski
379df7f24d Merge pull request #5883 from matrix-org/t3chguy/fix/16704
Fix typo in method call in add existing to space dialog
2021-04-19 17:53:10 +01:00
J. Ryan Stinnett
2d1615e433 Merge pull request #5872 from SimonBrandner/new-image-view-fixes
New Image View fixes/improvements
2021-04-19 17:37:42 +01:00
Michael Telatynski
4082a03769 Fix typo in method call in add existing to space dialog 2021-04-19 17:32:45 +01:00
Travis Ralston
01fc88f88a Merge pull request #5871 from matrix-org/travis/voice/countdown
Limit voice recording length
2021-04-19 10:30:38 -06:00
Michael Telatynski
12d96fe096 Merge pull request #5881 from matrix-org/t3chguy/fix/16704
Clean up add existing to space dialog and include DMs in it too
2021-04-19 17:29:09 +01:00
Michael Telatynski
e01caba068 Clean up add existing to space dialog and include DMs in it too 2021-04-19 08:54:06 +01:00
Germain Souquet
3c85092f1a Cleanup unused state in MessageComposer 2021-04-16 17:36:14 +01:00
Travis Ralston
d23f66bb47 Update documentation 2021-04-16 10:11:04 -06:00
Travis Ralston
f955f33071 Merge branch 'develop' into travis/voice/countdown 2021-04-16 10:00:11 -06:00
Travis Ralston
7878e1cd57 Merge pull request #5870 from matrix-org/travis/voice/disable-composer
Properly disable composer access when recording a voice message
2021-04-16 07:36:53 -06:00
Germain Souquet
c1c3ac20cd correct always visible logic 2021-04-16 12:22:00 +01:00
Germain Souquet
daaaa3da95 add context for roomsublist rendering 2021-04-16 10:26:29 +01:00
Germain Souquet
327983672e refactor renderSublists for better readability 2021-04-16 10:17:46 +01:00
Germain Souquet
f1453e8d2b extract always visible logic to RoomList 2021-04-16 09:43:59 +01:00
Germain
4708c1682d Merge pull request #5862 from matrix-org/gsouquet-start-dm 2021-04-15 17:25:15 +01:00
J. Ryan Stinnett
495aff898f Merge pull request #5864 from SimonBrandner/dont-render-msg-option
Render msgOption only if showReadReceipts is enabled
2021-04-15 17:24:13 +01:00