From 4544b091a0722190f5aa21a1e01ff5df5b435bcf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Feb 2020 19:27:53 +0400
Subject: [PATCH] Allow rotating content in media viewer.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../Resources/icons/mediaview_download.png    | Bin 177 -> 513 bytes
 .../Resources/icons/mediaview_download@2x.png | Bin 278 -> 1060 bytes
 .../Resources/icons/mediaview_download@3x.png | Bin 417 -> 1638 bytes
 Telegram/Resources/icons/mediaview_rotate.png | Bin 0 -> 912 bytes
 .../Resources/icons/mediaview_rotate@2x.png   | Bin 0 -> 1805 bytes
 .../Resources/icons/mediaview_rotate@3x.png   | Bin 0 -> 2600 bytes
 .../SourceFiles/data/data_media_rotation.cpp  |  49 ++++
 .../SourceFiles/data/data_media_rotation.h    |  29 ++
 Telegram/SourceFiles/data/data_session.cpp    |   4 +-
 Telegram/SourceFiles/data/data_session.h      |   5 +
 .../SourceFiles/media/view/media_view.style   |   1 +
 .../media/view/media_view_overlay_widget.cpp  | 266 ++++++++++++------
 .../media/view/media_view_overlay_widget.h    |  15 +-
 .../view/media_view_playback_controls.cpp     |   4 +
 .../media/view/media_view_playback_controls.h |   1 +
 Telegram/lib_ui                               |   2 +-
 17 files changed, 289 insertions(+), 89 deletions(-)
 create mode 100644 Telegram/Resources/icons/mediaview_rotate.png
 create mode 100644 Telegram/Resources/icons/mediaview_rotate@2x.png
 create mode 100644 Telegram/Resources/icons/mediaview_rotate@3x.png
 create mode 100644 Telegram/SourceFiles/data/data_media_rotation.cpp
 create mode 100644 Telegram/SourceFiles/data/data_media_rotation.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 8adc9d7e1..96701f773 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -337,6 +337,8 @@ PRIVATE
     data/data_groups.h
     data/data_location.cpp
     data/data_location.h
+    data/data_media_rotation.cpp
+    data/data_media_rotation.h
     data/data_media_types.cpp
     data/data_media_types.h
     data/data_messages.cpp
diff --git a/Telegram/Resources/icons/mediaview_download.png b/Telegram/Resources/icons/mediaview_download.png
index c00f9a86fdb8fdad849e23c068333a26a3acf863..8866edd51c888223d0e3a3c0fa4b5867f5c40d5b 100644
GIT binary patch
literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp200004XF*Lt006O%
z3;baP0005FNkl<ZNDb|lyQ;!K5QaCWu(VS|5WzxiV=LH+2wI3(h~R_R`zGSs*oq?F
zS}R4wJ9G9A$(&uhZBnSk8QAP*X8-y28e$0{NS3$Q&s!)i<hx<rZdYu#TY)-=Vb6@q
z@pvQ{YCk&kwOoO$%uI5)qh&#EZr{CU=JUAi`9HJUH3{JP>@wmw+qNx2p-_Oa3juvP
zoqnj*E@!{rcP{N>v7k&Qqs3$fC+0oyu9j#tN`t|`3HN$EE#~&q1=H!&%SEfzisURc
z5eH>M1;t`98V-jXp3mo6{4T6suhaQ_X3=`RrhGonLJlafcsx$y@t8x`>y=uq7HgD2
z=`%y1QmN2>zi07ox1&<2<cQhn!V-xDO(qj|1JrJ}?}6aEg~3-S6lk;Aa1wlYF>BS5
z$t2BYGj?4r7iu<}k3f%M0OoQzXWzVRNT%9yx#U+YeWTHM26_$y5GPVi%Gs61>2#u6
zt@aA^8U`TtWi%Qo>HnIC!-1;RstL#p24Ex-;XCA^aEQv~vMI<M24FZGCR_y=mabSV
z`T_Za0hmgqsMG0CHk<Ve^8Z^Pfr0I_U;V(tHW2;-FU@K($jyMX00000NkvXXu0mjf
D#d_{*

literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9a!3HF~Pw#sVq$)gJ978O6-(L3SYf#`}xzHEa
zvv}&}!VQKJy`MDY@9roNV$z(seRT)NXJMxWQ-6fNeo&#J*c~Xua5N{=Ozo4i{TEG+
zH*XIogfYCDQ{7te{`>4zS$Wm^8>{u~<|mmyX-eD3<GC<!P1BSBe&Y#NDT%yC+KSe6
bb`&r(P02O-JU1i{=mrK)S3j3^P6<r_4j@A2

diff --git a/Telegram/Resources/icons/mediaview_download@2x.png b/Telegram/Resources/icons/mediaview_download@2x.png
index 2fbbc999dae6144b3391634a6c643dd414f9d9b4..e5c3cf39f780af854f3782133457cd3c3e71da3a 100644
GIT binary patch
literal 1060
zcmV+<1l#+GP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00004XF*Lt006O%
z3;baP000BqNkl<ZXa((ByGt`c5Z{C-s2~afg`gNg5EO}pB3LMh*jd@wSOmes#>U3R
zO3*(+{0EZ8MidJRA4nP-8$l33L=hh$_`nD1xN~HWd+hFA^4*AExP`F0vopV$-%PT%
zdm3Sk0smB7i&h+?BB7Aj|5n+sVqwJ`8K|zVX3NXV?E3oJ_~002ztM2JC;M<B;A|+P
z^jXBFBZUrlrJTGB88xwpV8?rs##u>mBN22>*TP+qF1IwuVZ~_jN{1R&j4rn{$YI53
z@=AvqR*WvUG{|AaX!1&j8di)hw=~EVTd|l|zT)vXOQ+MUv9XbDZEdlGg99&<z}H(_
zTiN*dIQ#hcVC(Da?Ee1Vmk;GNy}P>`?(XhvH{g|(6{SA+=328ETP8AHnQUTW0-m3r
zO-qcYr>Do|M`G&^Mkwv<?3jSo!P?pyM59qZ;8ru+SoqNOlarJ1`T1$H!^!UMt{>lO
zV)=aD1u6uYOa`i|syrPCeP^#Dglkh%Q}Ffm<uo(qkB^U@emRDk*#7>$6j%s1H#ecC
zrbg>T=sJ6yU;dj`l0uwZE~oWb#8wkarBd+p^yG}mHs9OZgZlb<r6ZfNWuhWBGcyC<
z-`^HZ`|$1U4F(1Vl>RKZYGSC=-`@`p4-a;9$L#3n2>9+Pb>>htr<MRryV==UEveVn
zR~Q=`GxcQ{7MY$HDt2{s!PV838I){ra&iKRM8f4%ri(I50LFN3Zce3Y$X{MwU}R*(
zW#`1P%)N=Bax$5Ov$Hd;^Yim_Xm4+~Iae820)YAXd6k+W$L)S-Xvl_ZwO5S&5kuqV
z=4LoPKGp_-Z+@}D!kJ20tS>Aqs8kF&?tp`XgC?G^^U?b!hF}d14RCmPs0{{xlYM=C
zMldQx#9CZjR4p6wLZRSyqmU6VjTi=0TU!g;+uPcpFw?`s!%Cf{r6uJWF5oj%B*#Z}
zf+2>E@Zp@zX0^fLE>=$CXF=%g?Ue;vimddCi45YgYISwBoY<8%x3{-`&w^eg%O@rX
z%KiqXj9jyDb8}<ccm#f#{l61K$6i~uhL5p?yJ=@<r&kq9Sr3L7lAE5M)}HZH<Ss8S
zp`)Xtl%W0S21g9Z;r;3T{awYuCBL}1a6Qz^{OUQ$21^Ws8XX<AT@GDriUK^Tw6(Q4
z0}5&$JTWAPCve?;4v%LoEiFNjkm1k}LvpfL3s|hv(^KhzIiRngAW26I1Ffs81O5WW
zxZ>kIYhz;rnwpw~bF!ZNzXmutqw!-Hi^XD$AGL&twEs0?q%0)h75l<8Bqpi$pB9A`
e`_tu-1os2<D|-0D7jdTm0000<MNUMnLSTab?*x<p

literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^DnP8o!3HF6bNze)r0#mUIEF;DzP;hicUXbPHSkVe
zkLK>CvzvIsL%OcioG>=?wE8f0k&nZim9kD8IzNNFVzQrJyfwEh{8yjEl7l*1cV8;c
z2wXVB_4qEqi7)P){&I@dlH;kul;!|FClrRr#?m=6?#%8e>iMW|uyo4%`Nij6DHepC
z-7qU=zRTZ)Ym2`Kui#CyzkR>c>VS;C^gD-AgTHT&PhBB==BL#&E|CKd{$B8z!k`=-
zan^y;@DuMWR?~)w&0AJDo{`89S$d$Sd5MOq8@rPRvm5`bg*_6|8Qn(7P7nA^T-^`H
T-cObUdX&M_)z4*}Q$iB}@6L2Y

diff --git a/Telegram/Resources/icons/mediaview_download@3x.png b/Telegram/Resources/icons/mediaview_download@3x.png
index 19de65b4a12ba3ea761afab3d057242d9d72a211..20e22ce52741e673dde1fb8a63b6d5b7b9558f12 100644
GIT binary patch
literal 1638
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

literal 417
zcmeAS@N?(olHy`uVBq!ia0vp^W<YGu!3HE(ds&MzFfe9#x;TbpG`_uM*w<pf)0)`M
zBw%an{_spm!OVsS0*)RjQ>Sj55!uGs$t&@5x`y!6)s;X)zG!zHDvM3;H5Ah>pT7I@
zUD?muG$L+q%UJMz*0Ro~mG-e7$0SZ{()scu@3W2byypj>FHX3|CjZq-Q?$lRvG!&w
zXHPWK<7o$Ws2b$qXD(fqxhXZ$Y1XoS2Hn$4QP~00e!aiTy7o2KNdq4L;)51_6Rwo<
z`X93FHr|;N8XA`EyN$tO^}hG@y86W&?{=79d3~-~JCFHm{eeTg-x;^=J@c^Xwqxx)
znY*&zS-0+Ax=Z^U^VeFHGV?j=r}F=niQi$I@_)_ytUHcV?B96BFuam@!xf|O%HoYr
z42u>|8JnJvDBt2EiVGekh*+qE*zgFqcN}U=d@v!fVuOSXBbT^Xld{vp!+j4p0!<9$
qWemIcwzXR`x^mw>G`ERqgFWxDt^ZyA-joFfJ%gvKpUXO@geCxrov$(g

diff --git a/Telegram/Resources/icons/mediaview_rotate.png b/Telegram/Resources/icons/mediaview_rotate.png
new file mode 100644
index 0000000000000000000000000000000000000000..818a9b8729c3715a8d1744a168727f437941c535
GIT binary patch
literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp200004XF*Lt006O%
z3;baP0009=Nkl<ZNDaMK%PW0R6yEoG<o%8!&k~Y^giII+LjxvKikT$iTLuOu`~~J_
zC>e^RB=6VM%=@i`5Z`Zq=l=G#5BJ=AuKN8}o%XtW?{9r)?e*<-k4Fdr`TQ62{+1;+
zHdc&|j)o0qW??<q+1c3K+ypI5Y<NV~)zvsTIkAZTDOpEH2cDjuG!dQN-d?n|wIM4j
z%T1Q<GVAK<!sq9wjmZ4LH6CqWUmqePBb|udku^6r|H#TDGyS8ZBh=N^1tN4uMj_PH
z)Zp~=)QpRPfdPz<k7I9d&o=-1`ih>Op6`T#$@25_;q&>Bo11F`<mBXFdwW|4Hr3eB
z(15kIHNE!!{*Lzcb`$@TtfZtwXK;LcjN;;A6M(q5ILyq<SV2uP`mERF<fJCNzP?6E
zN{YhU$;!*iadB~>H`6&gJ40DnnF3g&$KyeFceia$5qrH}%+Js37!wl{YTp-GWo0G!
zCdxiOK9q~g%S%*LR47o$k;nh?@?znyuC5Rf5kZWfjK#mbz16{Yc6Lx&T52o&&CLy}
zs;WW~shHE#(>h*bW22vpGJSY>&<h(I8%Rw}wSuOlrD1DpORwGC-J!O&))nE<(2&Mi
z%8ZVVwjJI2`Z|)5l5D|PV3UwFjf#r0?NQm7BWtQ`cz76IDNi94C-?YGN?yqGRzIyV
zFE3B<QO5nmg|f`dOua>F!SW#|ad2>;Uc$<hVv(z0<7KUs?e6X(BO@bZR>aQD%_$h_
z>+6Z}3nV=~9TbH!ilx85ANTk7YRc+;s+J1pG!_*Vfn9`letr&K2Tev0Yr~oaGIoaK
z<YZSF@nSD5Ea)&}V`B>Ub<aphajdSc>Wy?(R#uRhn5Y0j$C#KHOifK`JR5?6wUd!B
zAt3?F%gYvEad8px@$o?kh~d-P+KT=CeNDt;Y-(!KSkK>$a<H3}wvhKv$YZrBud}mL
z3=R$oDJUWTN(8?}3JMBDOG}F=EG*PPo}ZtEyjx;+c2>{P(adgqv&-ldzB$a!p|yoa
zHZn2-vu7%vx3@PeEiHln=xow~Ufl5*nX;2f)e70Ng#7LhJTBQ$#Npwgczk?xf>`sv
mA`2QZ$l|X*QiH^FT>1kUqg9aGJm+Nq0000<MNUMnLSTaPO~bqZ

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview_rotate@2x.png b/Telegram/Resources/icons/mediaview_rotate@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fc04404b9fe18469c279746f6feb17de7938525
GIT binary patch
literal 1805
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview_rotate@3x.png b/Telegram/Resources/icons/mediaview_rotate@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8369b477b5596ba619585eb4b6482b422fef594b
GIT binary patch
literal 2600
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
KMNUMnLSTY!KJ`oh

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/data/data_media_rotation.cpp b/Telegram/SourceFiles/data/data_media_rotation.cpp
new file mode 100644
index 000000000..eaa0a1290
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_media_rotation.cpp
@@ -0,0 +1,49 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_media_rotation.h"
+
+namespace Data {
+namespace {
+
+[[nodiscard]] int NormalizeRotation(int rotation) {
+	const auto result = rotation
+		- ((rotation / 360) - ((rotation < 0) ? 1 : 0)) * 360;
+
+	Ensures(result >= 0 && result < 360);
+	return result;
+}
+
+} // namespace
+
+void MediaRotation::set(not_null<PhotoData*> photo, int rotation) {
+	if (rotation % 360) {
+		_photoRotations[photo] = NormalizeRotation(rotation);
+	} else {
+		_photoRotations.remove(photo);
+	}
+}
+
+int MediaRotation::get(not_null<PhotoData*> photo) const {
+	const auto i = _photoRotations.find(photo);
+	return (i != end(_photoRotations)) ? i->second : 0;
+}
+
+void MediaRotation::set(not_null<DocumentData*> document, int rotation) {
+	if (rotation % 360) {
+		_documentRotations[document] = NormalizeRotation(rotation);
+	} else {
+		_documentRotations.remove(document);
+	}
+}
+
+int MediaRotation::get(not_null<DocumentData*> document) const {
+	const auto i = _documentRotations.find(document);
+	return (i != end(_documentRotations)) ? i->second : 0;
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_media_rotation.h b/Telegram/SourceFiles/data/data_media_rotation.h
new file mode 100644
index 000000000..1f4f9fc70
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_media_rotation.h
@@ -0,0 +1,29 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class PhotoData;
+class DocumentData;
+
+namespace Data {
+
+class MediaRotation final {
+public:
+	void set(not_null<PhotoData*> photo, int rotation);
+	[[nodiscard]] int get(not_null<PhotoData*> photo) const;
+
+	void set(not_null<DocumentData*> document, int rotation);
+	[[nodiscard]] int get(not_null<DocumentData*> document) const;
+
+private:
+	base::flat_map<not_null<PhotoData*>, int> _photoRotations;
+	base::flat_map<not_null<DocumentData*>, int> _documentRotations;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 1d6420c18..6638aa870 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -47,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_scheduled_messages.h"
 #include "data/data_cloud_themes.h"
 #include "data/data_streaming.h"
+#include "data/data_media_rotation.h"
 #include "base/platform/base_platform_info.h"
 #include "base/unixtime.h"
 #include "base/call_delayed.h"
@@ -192,7 +193,8 @@ Session::Session(not_null<Main::Session*> session)
 , _groups(this)
 , _scheduledMessages(std::make_unique<ScheduledMessages>(this))
 , _cloudThemes(std::make_unique<CloudThemes>(session))
-, _streaming(std::make_unique<Streaming>(this)) {
+, _streaming(std::make_unique<Streaming>(this))
+, _mediaRotation(std::make_unique<MediaRotation>()) {
 	_cache->open(Local::cacheKey());
 	_bigFileCache->open(Local::cacheBigFileKey());
 
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index eb21a0b0e..9b24d5294 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -60,6 +60,7 @@ class WallPaper;
 class ScheduledMessages;
 class CloudThemes;
 class Streaming;
+class MediaRotation;
 
 class Session final {
 public:
@@ -92,6 +93,9 @@ public:
 	[[nodiscard]] Streaming &streaming() const {
 		return *_streaming;
 	}
+	[[nodiscard]] MediaRotation &mediaRotation() const {
+		return *_mediaRotation;
+	}
 	[[nodiscard]] MsgId nextNonHistoryEntryId() {
 		return ++_nonHistoryEntryId;
 	}
@@ -984,6 +988,7 @@ private:
 	std::unique_ptr<ScheduledMessages> _scheduledMessages;
 	std::unique_ptr<CloudThemes> _cloudThemes;
 	std::unique_ptr<Streaming> _streaming;
+	std::unique_ptr<MediaRotation> _mediaRotation;
 	MsgId _nonHistoryEntryId = ServerMaxMsgId;
 
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 9490a2c0f..4f0344438 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -104,6 +104,7 @@ mediaviewLeft: icon {{ "mediaview_next-flip_horizontal", mediaviewControlFg }};
 mediaviewRight: icon {{ "mediaview_next", mediaviewControlFg }};
 mediaviewClose: icon {{ "mediaview_close", mediaviewControlFg }};
 mediaviewSave: icon {{ "mediaview_download", mediaviewControlFg }};
+mediaviewRotate: icon {{ "mediaview_rotate", mediaviewControlFg }};
 mediaviewMore: icon {{ "mediaview_more", mediaviewControlFg }};
 
 mediaviewFileRed: icon {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 8b5abdac4..e353fce52 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -39,6 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat.h"
 #include "data/data_user.h"
 #include "data/data_file_origin.h"
+#include "data/data_media_rotation.h"
 #include "window/themes/window_theme_preview.h"
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
@@ -198,6 +199,32 @@ QPixmap PrepareStaticImage(const QString &path) {
 	return App::pixmapFromImageInPlace(std::move(image));
 }
 
+[[nodiscard]] QRect RotatedRect(QRect rect, int rotation) {
+	switch (rotation) {
+	case 0: return rect;
+	case 90: return QRect(
+		rect.y(),
+		-rect.x() - rect.width(),
+		rect.height(),
+		rect.width());
+	case 180: return QRect(
+		-rect.x() - rect.width(),
+		-rect.y() - rect.height(),
+		rect.width(),
+		rect.height());
+	case 270: return QRect(
+		-rect.y() - rect.height(),
+		rect.x(),
+		rect.height(),
+		rect.width());
+	}
+	Unexpected("Rotation in RotatedRect.");
+}
+
+[[nodiscard]] bool UsePainterRotation(int rotation) {
+	return Platform::IsMac() || !(rotation % 180);
+}
+
 } // namespace
 
 struct OverlayWidget::SharedMedia {
@@ -432,6 +459,12 @@ void OverlayWidget::moveToScreen(bool force) {
 	update();
 }
 
+QSize OverlayWidget::flipSizeByRotation(QSize size) const {
+	return (((_rotation / 90) % 2) == 1)
+		? QSize(size.height(), size.width())
+		: size;
+}
+
 bool OverlayWidget::videoShown() const {
 	return _streamed && !_streamed->instance.info().video.cover.isNull();
 }
@@ -439,7 +472,7 @@ bool OverlayWidget::videoShown() const {
 QSize OverlayWidget::videoSize() const {
 	Expects(videoShown());
 
-	return _streamed->instance.info().video.size;
+	return flipSizeByRotation(_streamed->instance.info().video.size);
 }
 
 bool OverlayWidget::videoIsGifv() const {
@@ -498,7 +531,7 @@ QImage OverlayWidget::videoFrameForDirectPaint() const {
 }
 
 bool OverlayWidget::documentContentShown() const {
-	return _doc && (!_current.isNull() || videoShown());
+	return _doc && (!_staticContent.isNull() || videoShown());
 }
 
 bool OverlayWidget::documentBubbleShown() const {
@@ -506,7 +539,7 @@ bool OverlayWidget::documentBubbleShown() const {
 		|| (_doc
 			&& !_themePreviewShown
 			&& !_streamed
-			&& _current.isNull());
+			&& _staticContent.isNull());
 }
 
 void OverlayWidget::clearStreaming(bool savePosition) {
@@ -630,8 +663,10 @@ void OverlayWidget::updateControls() {
 		|| (_doc
 			&& _doc->filepath(DocumentData::FilePathResolve::Checked).isEmpty()
 			&& !_doc->loading());
-	_saveNav = myrtlrect(width() - st::mediaviewIconSize.width() * 2, height() - st::mediaviewIconSize.height(), st::mediaviewIconSize.width(), st::mediaviewIconSize.height());
+	_saveNav = myrtlrect(width() - st::mediaviewIconSize.width() * 3, height() - st::mediaviewIconSize.height(), st::mediaviewIconSize.width(), st::mediaviewIconSize.height());
 	_saveNavIcon = style::centerrect(_saveNav, st::mediaviewSave);
+	_rotateNav = myrtlrect(width() - st::mediaviewIconSize.width() * 2, height() - st::mediaviewIconSize.height(), st::mediaviewIconSize.width(), st::mediaviewIconSize.height());
+	_rotateNavIcon = style::centerrect(_rotateNav, st::mediaviewRotate);
 	_moreNav = myrtlrect(width() - st::mediaviewIconSize.width(), height() - st::mediaviewIconSize.height(), st::mediaviewIconSize.width(), st::mediaviewIconSize.height());
 	_moreNavIcon = style::centerrect(_moreNav, st::mediaviewMore);
 
@@ -826,6 +861,7 @@ bool OverlayWidget::updateControlsAnimation(crl::time now) {
 		+ (_over == OverRightNav ? _rightNav : _rightNavIcon)
 		+ (_over == OverClose ? _closeNav : _closeNavIcon)
 		+ _saveNavIcon
+		+ _rotateNavIcon
 		+ _moreNavIcon
 		+ _headerNav
 		+ _nameNav
@@ -848,6 +884,15 @@ void OverlayWidget::updateCursor() {
 		: (_over == OverNone ? style::cur_default : style::cur_pointer));
 }
 
+int OverlayWidget::contentRotation() const {
+	if (!_streamed) {
+		return _rotation;
+	}
+	return (_rotation + (_streamed
+		? _streamed->instance.info().video.rotation
+		: 0)) % 360;
+}
+
 QRect OverlayWidget::contentRect() const {
 	return { _x, _y, _w, _h };
 }
@@ -1410,12 +1455,9 @@ void OverlayWidget::onOverview() {
 void OverlayWidget::onCopy() {
 	_dropdown->hideAnimated(Ui::DropdownMenu::HideOption::IgnoreShow);
 	if (_doc) {
-		if (videoShown()) {
-			QGuiApplication::clipboard()->setImage(
-				transformVideoFrame(videoFrame()));
-		} else if (!_current.isNull()) {
-			QGuiApplication::clipboard()->setPixmap(_current);
-		}
+		QGuiApplication::clipboard()->setImage(videoShown()
+			? transformVideoFrame(videoFrame())
+			: transformStaticContent(_staticContent));
 	} else if (_photo && _photo->loaded()) {
 		QGuiApplication::clipboard()->setPixmap(_photo->large()->pix(fileOrigin()));
 	}
@@ -1899,6 +1941,7 @@ void OverlayWidget::displayPhoto(not_null<PhotoData*> photo, HistoryItem *item)
 	_doc = nullptr;
 	_fullScreenVideo = false;
 	_photo = photo;
+	_rotation = _photo->owner().mediaRotation().get(_photo);
 	_radial.stop();
 
 	refreshMediaViewer();
@@ -1907,10 +1950,13 @@ void OverlayWidget::displayPhoto(not_null<PhotoData*> photo, HistoryItem *item)
 	_zoom = 0;
 	_zoomToScreen = _zoomToDefault = 0;
 	_blurred = true;
-	_current = QPixmap();
+	_staticContent = QPixmap();
 	_down = OverNone;
-	_w = style::ConvertScale(photo->width());
-	_h = style::ConvertScale(photo->height());
+	const auto size = style::ConvertScale(flipSizeByRotation(QSize(
+		photo->width(),
+		photo->height())));
+	_w = size.width();
+	_h = size.height();
 	contentSizeChanged();
 	refreshFromLabel(item);
 	_photo->download(fileOrigin());
@@ -1948,10 +1994,11 @@ void OverlayWidget::displayDocument(
 		moveToScreen();
 	}
 	_fullScreenVideo = false;
-	_current = QPixmap();
+	_staticContent = QPixmap();
 	clearStreaming(_doc != doc);
 	destroyThemePreview();
 	_doc = doc;
+	_rotation = _doc ? _doc->owner().mediaRotation().get(_doc) : 0;
 	_themeCloudData = cloud;
 	_photo = nullptr;
 	_radial.stop();
@@ -1960,9 +2007,9 @@ void OverlayWidget::displayDocument(
 	if (_doc) {
 		if (_doc->sticker()) {
 			if (const auto image = _doc->getStickerLarge()) {
-				_current = image->pix(fileOrigin());
+				_staticContent = image->pix(fileOrigin());
 			} else if (_doc->hasThumbnail()) {
-				_current = _doc->thumbnail()->pixBlurred(
+				_staticContent = _doc->thumbnail()->pixBlurred(
 					fileOrigin(),
 					_doc->dimensions.width(),
 					_doc->dimensions.height());
@@ -1981,7 +2028,7 @@ void OverlayWidget::displayDocument(
 				if (location.accessEnable()) {
 					const auto &path = location.name();
 					if (QImageReader(path).canRead()) {
-						_current = PrepareStaticImage(path);
+						_staticContent = PrepareStaticImage(path);
 					}
 				}
 				location.accessDisable();
@@ -2045,10 +2092,12 @@ void OverlayWidget::displayDocument(
 		_docIconRect = myrtlrect(_docRect.x() + st::mediaviewFilePadding, _docRect.y() + st::mediaviewFilePadding, st::mediaviewFileIconSize, st::mediaviewFileIconSize);
 	} else if (_themePreviewShown) {
 		updateThemePreviewGeometry();
-	} else if (!_current.isNull()) {
-		_current.setDevicePixelRatio(cRetinaFactor());
-		_w = style::ConvertScale(_current.width());
-		_h = style::ConvertScale(_current.height());
+	} else if (!_staticContent.isNull()) {
+		_staticContent.setDevicePixelRatio(cRetinaFactor());
+		const auto size = style::ConvertScale(
+			flipSizeByRotation(_staticContent.size()));
+		_w = size.width();
+		_h = size.height();
 	} else if (videoShown()) {
 		const auto contentSize = style::ConvertScale(videoSize());
 		_w = contentSize.width();
@@ -2175,7 +2224,7 @@ void OverlayWidget::initStreamingThumbnail() {
 	const auto h = size.height();
 	const auto options = VideoThumbOptions(_doc);
 	const auto goodOptions = (options & ~Images::Option::Blurred);
-	_current = (useGood
+	_staticContent = (useGood
 		? good
 		: useThumb
 		? thumb
@@ -2188,20 +2237,24 @@ void OverlayWidget::initStreamingThumbnail() {
 			useGood ? goodOptions : options,
 			w / cIntRetinaFactor(),
 			h / cIntRetinaFactor());
-	_current.setDevicePixelRatio(cRetinaFactor());
+	_staticContent.setDevicePixelRatio(cRetinaFactor());
 }
 
 void OverlayWidget::streamingReady(Streaming::Information &&info) {
 	if (videoShown()) {
-		const auto contentSize = style::ConvertScale(videoSize());
-		if (contentSize != QSize(_width, _height)) {
-			update(contentRect());
-			_w = contentSize.width();
-			_h = contentSize.height();
-			contentSizeChanged();
-		}
+		applyVideoSize();
+	}
+	update(contentRect());
+}
+
+void OverlayWidget::applyVideoSize() {
+	const auto contentSize = style::ConvertScale(videoSize());
+	if (contentSize != QSize(_width, _height)) {
+		update(contentRect());
+		_w = contentSize.width();
+		_h = contentSize.height();
+		contentSizeChanged();
 	}
-	this->update(contentRect());
 }
 
 bool OverlayWidget::createStreamingObjects() {
@@ -2234,20 +2287,32 @@ bool OverlayWidget::createStreamingObjects() {
 QImage OverlayWidget::transformVideoFrame(QImage frame) const {
 	Expects(videoShown());
 
-	if (_streamed->instance.info().video.rotation != 0) {
+	const auto rotation = contentRotation();
+	if (rotation != 0) {
 		auto transform = QTransform();
-		transform.rotate(_streamed->instance.info().video.rotation);
+		transform.rotate(rotation);
 		frame = frame.transformed(transform);
 	}
-	if (frame.size() != _streamed->instance.info().video.size) {
+	const auto requiredSize = videoSize();
+	if (frame.size() != requiredSize) {
 		frame = frame.scaled(
-			_streamed->instance.info().video.size,
+			requiredSize,
 			Qt::IgnoreAspectRatio,
 			Qt::SmoothTransformation);
 	}
 	return frame;
 }
 
+QImage OverlayWidget::transformStaticContent(QPixmap content) const {
+	auto image = content.toImage();
+	if (!_rotation) {
+		return image;
+	}
+	auto transform = QTransform();
+	transform.rotate(_rotation);
+	return image.transformed(transform);
+}
+
 void OverlayWidget::handleStreamingUpdate(Streaming::Update &&update) {
 	using namespace Streaming;
 
@@ -2420,6 +2485,25 @@ void OverlayWidget::playbackControlsToPictureInPicture() {
 	}
 }
 
+void OverlayWidget::playbackControlsRotate() {
+	if (_photo) {
+		auto &storage = _photo->owner().mediaRotation();
+		storage.set(_photo, storage.get(_photo) - 90);
+		_rotation = storage.get(_photo);
+		redisplayContent();
+	} else if (_doc) {
+		auto &storage = _doc->owner().mediaRotation();
+		storage.set(_doc, storage.get(_doc) - 90);
+		_rotation = storage.get(_doc);
+		if (videoShown()) {
+			applyVideoSize();
+			update(contentRect());
+		} else {
+			redisplayContent();
+		}
+	}
+}
+
 void OverlayWidget::playbackPauseResume() {
 	Expects(_streamed != nullptr);
 
@@ -2449,7 +2533,9 @@ void OverlayWidget::restartAtSeekPosition(crl::time position) {
 
 	if (videoShown()) {
 		_streamed->instance.saveFrameToCover();
-		_current = Images::PixmapFast(transformVideoFrame(videoFrame()));
+		const auto saved = base::take(_rotation);
+		_staticContent = Images::PixmapFast(transformVideoFrame(videoFrame()));
+		_rotation = saved;
 		update(contentRect());
 	}
 	auto options = Streaming::PlaybackOptions();
@@ -2625,18 +2711,18 @@ void OverlayWidget::validatePhotoImage(Image *image, bool blurred) {
 			image->load(fileOrigin());
 		}
 		return;
-	} else if (!_current.isNull() && (blurred || !_blurred)) {
+	} else if (!_staticContent.isNull() && (blurred || !_blurred)) {
 		return;
 	}
 	const auto w = _width * cIntRetinaFactor();
 	const auto h = _height * cIntRetinaFactor();
-	_current = image->pixNoCache(
+	_staticContent = image->pixNoCache(
 		fileOrigin(),
 		w,
 		h,
 		Images::Option::Smooth
 		| (blurred ? Images::Option::Blurred : Images::Option(0)));
-	_current.setDevicePixelRatio(cRetinaFactor());
+	_staticContent.setDevicePixelRatio(cRetinaFactor());
 	_blurred = blurred;
 }
 
@@ -2645,7 +2731,7 @@ void OverlayWidget::validatePhotoCurrentImage() {
 	validatePhotoImage(_photo->thumbnail(), true);
 	validatePhotoImage(_photo->thumbnailSmall(), true);
 	validatePhotoImage(_photo->thumbnailInline(), true);
-	if (_current.isNull()
+	if (_staticContent.isNull()
 		&& _peer
 		&& !_msgid
 		&& _peer->userpicLoaded()
@@ -2654,7 +2740,7 @@ void OverlayWidget::validatePhotoCurrentImage() {
 			Images::Create(_peer->userpicLocation()).get(),
 			true);
 	}
-	if (_current.isNull()) {
+	if (_staticContent.isNull()) {
 		_photo->loadThumbnailSmall(fileOrigin());
 	}
 }
@@ -2697,14 +2783,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 			if (videoShown()) {
 				paintTransformedVideoFrame(p);
 			} else {
-				if ((!_doc || !_doc->getStickerLarge())
-					&& (_current.isNull() || _current.hasAlpha())) {
-					p.fillRect(rect, _transparentBrush);
-				}
-				if (!_current.isNull()) {
-					PainterHighQualityEnabler hq(p);
-					p.drawPixmap(rect, _current);
-				}
+				paintTransformedStaticContent(p);
 			}
 
 			const auto radial = _radial.animating();
@@ -2834,6 +2913,13 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 			st::mediaviewSave.paintInCenter(p, _saveNavIcon);
 		}
 
+		// rotate button
+		if (_rotateNavIcon.intersects(r)) {
+			auto o = overLevel(OverRotate);
+			p.setOpacity((o * st::mediaviewIconOverOpacity + (1 - o) * st::mediaviewIconOpacity) * co);
+			st::mediaviewRotate.paintInCenter(p, _rotateNavIcon);
+		}
+
 		// more area
 		if (_moreNavIcon.intersects(r)) {
 			auto o = overLevel(OverMore);
@@ -2927,46 +3013,52 @@ void OverlayWidget::paintTransformedVideoFrame(Painter &p) {
 
 	const auto rect = contentRect();
 	const auto image = videoFrameForDirectPaint();
-	//if (_fullScreenVideo) {
-	//	const auto fill = rect.intersected(this->rect());
-	//	PaintImageProfile(p, image, rect, fill);
-	//} else {
-	const auto rotation = _streamed->instance.info().video.rotation;
-	const auto rotated = [](QRect rect, int rotation) {
-		switch (rotation) {
-		case 0: return rect;
-		case 90: return QRect(
-			rect.y(),
-			-rect.x() - rect.width(),
-			rect.height(),
-			rect.width());
-		case 180: return QRect(
-			-rect.x() - rect.width(),
-			-rect.y() - rect.height(),
-			rect.width(),
-			rect.height());
-		case 270: return QRect(
-			-rect.y() - rect.height(),
-			rect.x(),
-			rect.height(),
-			rect.width());
-		}
-		Unexpected("Rotation in OverlayWidget::paintTransformedVideoFrame");
-	};
 
 	PainterHighQualityEnabler hq(p);
-	if (rotation) {
-		p.save();
-		p.rotate(rotation);
-	}
-	p.drawImage(rotated(rect, rotation), image);
-	if (rotation) {
-		p.restore();
+
+	const auto rotation = contentRotation();
+	if (UsePainterRotation(rotation)) {
+		if (rotation) {
+			p.save();
+			p.rotate(rotation);
+		}
+		p.drawImage(RotatedRect(rect, rotation), image);
+		if (rotation) {
+			p.restore();
+		}
+	} else {
+		p.drawImage(rect, transformVideoFrame(image));
 	}
 	if (_streamed->instance.player().ready()) {
 		_streamed->instance.markFrameShown();
 	}
-	//}
+}
+
+void OverlayWidget::paintTransformedStaticContent(Painter &p) {
+	const auto rect = contentRect();
+
+	PainterHighQualityEnabler hq(p);
+	if ((!_doc || !_doc->getStickerLarge())
+		&& (_staticContent.isNull()
+			|| _staticContent.hasAlpha())) {
+		p.fillRect(rect, _transparentBrush);
+	}
+	if (_staticContent.isNull()) {
+		return;
+	}
+	const auto rotation = contentRotation();
+	if (UsePainterRotation(rotation)) {
+		if (rotation) {
+			p.save();
+			p.rotate(rotation);
+		}
+		p.drawPixmap(RotatedRect(rect, rotation), _staticContent);
+		if (rotation) {
+			p.restore();
+		}
+	} else {
+		p.drawImage(rect, transformStaticContent(_staticContent));
+	}
 }
 
 void OverlayWidget::paintRadialLoading(
@@ -3438,6 +3530,7 @@ void OverlayWidget::mousePressEvent(QMouseEvent *e) {
 				|| _over == OverDate
 				|| _over == OverHeader
 				|| _over == OverSave
+				|| _over == OverRotate
 				|| _over == OverIcon
 				|| _over == OverMore
 				|| _over == OverClose
@@ -3515,6 +3608,7 @@ void OverlayWidget::updateOverRect(OverState state) {
 	case OverName: update(_nameNav); break;
 	case OverDate: update(_dateNav); break;
 	case OverSave: update(_saveNavIcon); break;
+	case OverRotate: update(_rotateNavIcon); break;
 	case OverIcon: update(_docIconRect); break;
 	case OverHeader: update(_headerNav); break;
 	case OverClose: update(_closeNav); break;
@@ -3608,6 +3702,8 @@ void OverlayWidget::updateOver(QPoint pos) {
 		updateOverState(OverHeader);
 	} else if (_saveVisible && _saveNav.contains(pos)) {
 		updateOverState(OverSave);
+	} else if (_rotateNav.contains(pos)) {
+		updateOverState(OverRotate);
 	} else if (_doc && documentBubbleShown() && _docIconRect.contains(pos)) {
 		updateOverState(OverIcon);
 	} else if (_moreNav.contains(pos)) {
@@ -3650,6 +3746,8 @@ void OverlayWidget::mouseReleaseEvent(QMouseEvent *e) {
 		onOverview();
 	} else if (_over == OverSave && _down == OverSave) {
 		onDownload();
+	} else if (_over == OverRotate && _down == OverRotate) {
+		playbackControlsRotate();
 	} else if (_over == OverIcon && _down == OverIcon) {
 		onDocClick();
 	} else if (_over == OverMore && _down == OverMore) {
@@ -3872,7 +3970,7 @@ void OverlayWidget::setVisibleHook(bool visible) {
 		clearStreaming();
 		destroyThemePreview();
 		_radial.stop();
-		_current = QPixmap();
+		_staticContent = QPixmap();
 		_themePreview = nullptr;
 		_themeApply.destroyDelayed();
 		_themeCancel.destroyDelayed();
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 12463a4ca..c998abd7e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -140,6 +140,7 @@ private:
 		OverName,
 		OverDate,
 		OverSave,
+		OverRotate,
 		OverMore,
 		OverIcon,
 		OverVideo,
@@ -180,6 +181,7 @@ private:
 	void playbackControlsToFullScreen() override;
 	void playbackControlsFromFullScreen() override;
 	void playbackControlsToPictureInPicture() override;
+	void playbackControlsRotate() override;
 	void playbackPauseResume();
 	void playbackToggleFullScreen();
 	void playbackPauseOnCall();
@@ -283,7 +285,8 @@ private:
 	void documentUpdated(DocumentData *doc);
 	void changingMsgId(not_null<HistoryItem*> row, MsgId newId);
 
-	QRect contentRect() const;
+	[[nodiscard]] int contentRotation() const;
+	[[nodiscard]] QRect contentRect() const;
 	void contentSizeChanged();
 
 	// Radial animation interface.
@@ -325,21 +328,27 @@ private:
 	void validatePhotoImage(Image *image, bool blurred);
 	void validatePhotoCurrentImage();
 
+	[[nodiscard]] QSize flipSizeByRotation(QSize size) const;
+
+	void applyVideoSize();
 	[[nodiscard]] bool videoShown() const;
 	[[nodiscard]] QSize videoSize() const;
 	[[nodiscard]] bool videoIsGifv() const;
 	[[nodiscard]] QImage videoFrame() const;
 	[[nodiscard]] QImage videoFrameForDirectPaint() const;
 	[[nodiscard]] QImage transformVideoFrame(QImage frame) const;
+	[[nodiscard]] QImage transformStaticContent(QPixmap content) const;
 	[[nodiscard]] bool documentContentShown() const;
 	[[nodiscard]] bool documentBubbleShown() const;
 	void paintTransformedVideoFrame(Painter &p);
+	void paintTransformedStaticContent(Painter &p);
 	void clearStreaming(bool savePosition = true);
 
 	QBrush _transparentBrush;
 
 	PhotoData *_photo = nullptr;
 	DocumentData *_doc = nullptr;
+	int _rotation = 0;
 	std::unique_ptr<SharedMedia> _sharedMedia;
 	std::optional<SharedMediaWithLastSlice> _sharedMediaData;
 	std::optional<SharedMediaWithLastSlice::Key> _sharedMediaDataKey;
@@ -351,7 +360,7 @@ private:
 	QRect _closeNav, _closeNavIcon;
 	QRect _leftNav, _leftNavIcon, _rightNav, _rightNavIcon;
 	QRect _headerNav, _nameNav, _dateNav;
-	QRect _saveNav, _saveNavIcon, _moreNav, _moreNavIcon;
+	QRect _rotateNav, _rotateNavIcon, _saveNav, _saveNavIcon, _moreNav, _moreNavIcon;
 	bool _leftNavVisible = false;
 	bool _rightNavVisible = false;
 	bool _saveVisible = false;
@@ -382,7 +391,7 @@ private:
 	QPoint _mStart;
 	bool _pressed = false;
 	int32 _dragging = 0;
-	QPixmap _current;
+	QPixmap _staticContent;
 	bool _blurred = true;
 
 	std::unique_ptr<Streamed> _streamed;
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index 059f7fb36..8228db670 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -223,6 +223,10 @@ void PlaybackControls::showMenu() {
 	addSpeed(1.75);
 	addSpeed(2.);
 	_menu.emplace(this, st::mediaviewControlsPopupMenu);
+	_menu->addAction("Rotate video", [=] {
+		_delegate->playbackControlsRotate();
+	});
+	_menu->addSeparator();
 	_menu->addAction(
 		tr::lng_mediaview_playback_speed(tr::now),
 		std::move(submenu));
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.h b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
index 69059be13..6e6617538 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.h
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
@@ -46,6 +46,7 @@ public:
 		virtual void playbackControlsToFullScreen() = 0;
 		virtual void playbackControlsFromFullScreen() = 0;
 		virtual void playbackControlsToPictureInPicture() = 0;
+		virtual void playbackControlsRotate() = 0;
 	};
 
 	PlaybackControls(QWidget *parent, not_null<Delegate*> delegate);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 1888853b5..628d3b9ab 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 1888853b52291c32ce5bbca7212e67c262c76cee
+Subproject commit 628d3b9ab6443acd352617ac78cc3131ba41dbbc