void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-06 15:13:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed display of rotate button in media view overlay for theme previews.

Browse source
This commit is contained in:
23rd 2020-07-13 18:14:16 +03:00 • committed by John Preston
parent d9c566ac44
commit 9cf15da2b1
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View file

@ -631,11 +631,18 @@ void OverlayWidget::updateControls() {
|| (_document || (_document
&& _document->filepath(true).isEmpty() && _document->filepath(true).isEmpty()
&& !_document->loading()); && !_document->loading());
_saveNav = myrtlrect(width() - st::mediaviewIconSize.width() * 3, height() - st::mediaviewIconSize.height(), st::mediaviewIconSize.width(), st::mediaviewIconSize.height()); _rotateVisible = !_themePreviewShown;
const auto navRect = [&](int i) {
return myrtlrect(width() - st::mediaviewIconSize.width() * i,
height() - st::mediaviewIconSize.height(),
st::mediaviewIconSize.width(),
st::mediaviewIconSize.height());
};
_saveNav = navRect(_rotateVisible ? 3 : 2);
_saveNavIcon = style::centerrect(_saveNav, st::mediaviewSave); _saveNavIcon = style::centerrect(_saveNav, st::mediaviewSave);
_rotateNav = myrtlrect(width() - st::mediaviewIconSize.width() * 2, height() - st::mediaviewIconSize.height(), st::mediaviewIconSize.width(), st::mediaviewIconSize.height()); _rotateNav = navRect(2);
_rotateNavIcon = style::centerrect(_rotateNav, st::mediaviewRotate); _rotateNavIcon = style::centerrect(_rotateNav, st::mediaviewRotate);
_moreNav = myrtlrect(width() - st::mediaviewIconSize.width(), height() - st::mediaviewIconSize.height(), st::mediaviewIconSize.width(), st::mediaviewIconSize.height()); _moreNav = navRect(1);
_moreNavIcon = style::centerrect(_moreNav, st::mediaviewMore); _moreNavIcon = style::centerrect(_moreNav, st::mediaviewMore);
const auto dNow = QDateTime::currentDateTime(); const auto dNow = QDateTime::currentDateTime();
@ -3003,7 +3010,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
} }
// rotate button // rotate button
if (_rotateNavIcon.intersects(r)) { if (_rotateVisible && _rotateNavIcon.intersects(r)) {
auto o = overLevel(OverRotate); auto o = overLevel(OverRotate);
p.setOpacity((o * st::mediaviewIconOverOpacity + (1 - o) * st::mediaviewIconOpacity) * co); p.setOpacity((o * st::mediaviewIconOverOpacity + (1 - o) * st::mediaviewIconOpacity) * co);
st::mediaviewRotate.paintInCenter(p, _rotateNavIcon); st::mediaviewRotate.paintInCenter(p, _rotateNavIcon);
@ -3827,7 +3834,7 @@ void OverlayWidget::updateOver(QPoint pos) {
updateOverState(OverHeader); updateOverState(OverHeader);
} else if (_saveVisible && _saveNav.contains(pos)) { } else if (_saveVisible && _saveNav.contains(pos)) {
updateOverState(OverSave); updateOverState(OverSave);
} else if (_rotateNav.contains(pos)) { } else if (_rotateVisible && _rotateNav.contains(pos)) {
updateOverState(OverRotate); updateOverState(OverRotate);
} else if (_document && documentBubbleShown() && _docIconRect.contains(pos)) { } else if (_document && documentBubbleShown() && _docIconRect.contains(pos)) {
updateOverState(OverIcon); updateOverState(OverIcon);

1
Telegram/SourceFiles/media/view/media_view_overlay_widget.h
View file

@ -383,6 +383,7 @@ private:
bool _leftNavVisible = false; bool _leftNavVisible = false;
bool _rightNavVisible = false; bool _rightNavVisible = false;
bool _saveVisible = false; bool _saveVisible = false;
bool _rotateVisible = false;
bool _headerHasLink = false; bool _headerHasLink = false;
QString _dateText; QString _dateText;
QString _headerText; QString _headerText;