mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-03 08:05:12 +00:00
Code Issues Releases Wiki Activity

Animated zoom in OpenGL media viewer.

Browse Source
This commit is contained in:
John Preston
2021-06-04 19:12:12 +04:00
parent 4c5421916a
commit 5324a626be
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View File

@@ -973,7 +973,13 @@ int OverlayWidget::contentRotation() const {
} }
QRect OverlayWidget::contentRect() const { QRect OverlayWidget::contentRect() const {
return { _x, _y, _w, _h }; const auto progress = _zoomAnimation.value(1.);
return {
anim::interpolate(_xOld, _x, progress),
anim::interpolate(_yOld, _y, progress),
anim::interpolate(_wOld, _w, progress),
anim::interpolate(_hOld, _h, progress),
};
} }
void OverlayWidget::contentSizeChanged() { void OverlayWidget::contentSizeChanged() {
@@ -1029,6 +1035,7 @@ void OverlayWidget::resizeContentByScreenSize() {
} }
_x = (width() - _w) / 2; _x = (width() - _w) / 2;
_y = (height() - _h) / 2; _y = (height() - _h) / 2;
_zoomAnimation.stop();
} }
float64 OverlayWidget::radialProgress() const { float64 OverlayWidget::radialProgress() const {
@@ -3729,6 +3736,12 @@ void OverlayWidget::setZoomLevel(int newZoom, bool force) {
const auto contentSize = videoShown() const auto contentSize = videoShown()
? style::ConvertScale(videoSize()) ? style::ConvertScale(videoSize())
: QSize(_width, _height); : QSize(_width, _height);
const auto current = contentRect();
_xOld = current.x();
_yOld = current.y();
_wOld = current.width();
_hOld = current.height();
_w = contentSize.width(); _w = contentSize.width();
_h = contentSize.height(); _h = contentSize.height();
if (z >= 0) { if (z >= 0) {
@@ -3751,7 +3764,16 @@ void OverlayWidget::setZoomLevel(int newZoom, bool force) {
_x = qRound(nx / (-z + 1) + width() / 2.); _x = qRound(nx / (-z + 1) + width() / 2.);
_y = qRound(ny / (-z + 1) + height() / 2.); _y = qRound(ny / (-z + 1) + height() / 2.);
} }
_zoomAnimation.stop();
snapXY(); snapXY();
if (_opengl) {
_zoomAnimation.start(
[=] { update(); },
0.,
1.,
st::widgetFadeDuration,
anim::easeOutCirc);
}
update(); update();
} }

2
Telegram/SourceFiles/media/view/media_view_overlay_widget.h
View File

@@ -467,6 +467,8 @@ private:
int _zoom = 0; // < 0 - out, 0 - none, > 0 - in int _zoom = 0; // < 0 - out, 0 - none, > 0 - in
float64 _zoomToScreen = 0.; // for documents float64 _zoomToScreen = 0.; // for documents
float64 _zoomToDefault = 0.; float64 _zoomToDefault = 0.;
int _xOld = 0, _yOld = 0, _wOld = 0, _hOld = 0;
Ui::Animations::Simple _zoomAnimation;
QPoint _mStart; QPoint _mStart;
bool _pressed = false; bool _pressed = false;
int32 _dragging = 0; int32 _dragging = 0;