procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Version 1.5.15: Fix macOS media viewer overlay. 

Regression was introduced in c1a0dad2b7.
This commit is contained in:
John Preston 2019-02-12 19:55:07 +03:00
parent 7d15cca1ee
commit ae6c152988
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3107,7 +3107,9 @@ void OverlayWidget::touchEvent(QTouchEvent *e) {
} }
bool OverlayWidget::eventHook(QEvent *e) { bool OverlayWidget::eventHook(QEvent *e) {
if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) { if (e->type() == QEvent::UpdateRequest) {
_wasRepainted = true;
} else if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
QTouchEvent *ev = static_cast<QTouchEvent*>(e); QTouchEvent *ev = static_cast<QTouchEvent*>(e);
if (ev->device()->type() == QTouchDevice::TouchScreen) { if (ev->device()->type() == QTouchDevice::TouchScreen) {
if (ev->type() != QEvent::TouchBegin || ev->touchPoints().isEmpty() || !childAt(mapFromGlobal(ev->touchPoints().cbegin()->screenPos().toPoint()))) { if (ev->type() != QEvent::TouchBegin || ev->touchPoints().isEmpty() || !childAt(mapFromGlobal(ev->touchPoints().cbegin()->screenPos().toPoint()))) {
@ -3175,6 +3177,25 @@ void OverlayWidget::setVisibleHook(bool visible) {
a_cOpacity = anim::value(1, 1); a_cOpacity = anim::value(1, 1);
_groupThumbs = nullptr; _groupThumbs = nullptr;
_groupThumbsRect = QRect(); _groupThumbsRect = QRect();
#if defined Q_OS_MAC && !defined MAC_OS_OLD
// QOpenGLWidget can't properly destroy a child widget if
// it is hidden exactly after that, so it must be repainted
// before it is hidden without the child widget.
if (!isHidden() && _clipController) {
_clipController.destroy();
_wasRepainted = false;
repaint();
if (!_wasRepainted) {
// Qt has some optimization to prevent too frequent repaints.
// If the previous repaint was less than 1/60 second it silently
// converts repaint() call to an update() call. But we have to
// repaint right now, before hide(), with _clipController destroyed.
auto event = QEvent(QEvent::UpdateRequest);
QApplication::sendEvent(this, &event);
}
}
#endif // Q_OS_MAC && !MAC_OS_OLD
} }
OverlayParent::setVisibleHook(visible); OverlayParent::setVisibleHook(visible);
if (visible) { if (visible) {

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

@ -417,6 +417,8 @@ private:
object_ptr<Ui::RoundButton> _themeApply = { nullptr }; object_ptr<Ui::RoundButton> _themeApply = { nullptr };
object_ptr<Ui::RoundButton> _themeCancel = { nullptr }; object_ptr<Ui::RoundButton> _themeCancel = { nullptr };
bool _wasRepainted = false;
}; };
} // namespace View } // namespace View