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

Fix radial animations on macOS. 

QOpenGLWidget doesn't draw antialiased ellipses and arcs,
so we use a software rasterizer and then draw the resulting image.
This commit is contained in:
John Preston 2019-03-11 13:51:15 +04:00
parent 7b3c452316
commit 261720c941
4 changed files with 102 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -342,7 +342,8 @@ QImage OverlayWidget::videoFrameForDirectPaint() const {
Expects(_streamed != nullptr); Expects(_streamed != nullptr);
const auto result = videoFrame(); const auto result = videoFrame();
#if defined Q_OS_MAC && !defined OS_MAC_OLD
#ifdef USE_OPENGL_OVERLAY_WIDGET
const auto bytesPerLine = result.bytesPerLine(); const auto bytesPerLine = result.bytesPerLine();
if (bytesPerLine == result.width() * 4) { if (bytesPerLine == result.width() * 4) {
return result; return result;
@ -371,7 +372,8 @@ QImage OverlayWidget::videoFrameForDirectPaint() const {
from += bytesPerLine; from += bytesPerLine;
} }
return cache; return cache;
#endif // Q_OS_MAC && !OS_MAC_OLD #endif // USE_OPENGL_OVERLAY_WIDGET
return result; return result;
} }
@ -767,10 +769,14 @@ bool OverlayWidget::radialLoading() const {
} }
QRect OverlayWidget::radialRect() const { QRect OverlayWidget::radialRect() const {
if (_doc) { if (_photo) {
return _docIconRect;
} else if (_photo) {
return _photoRadialRect; return _photoRadialRect;
} else if (_doc) {
return QRect(
QPoint(
_docIconRect.x() + ((_docIconRect.width() - st::radialSize.width()) / 2),
_docIconRect.y() + ((_docIconRect.height() - st::radialSize.height()) / 2)),
st::radialSize);
} }
return QRect(); return QRect();
} }
@ -1787,7 +1793,7 @@ void OverlayWidget::displayDocument(DocumentData *doc, HistoryItem *item) {
auto &location = _doc->location(true); auto &location = _doc->location(true);
if (location.accessEnable()) { if (location.accessEnable()) {
if (QImageReader(location.name()).canRead()) { if (QImageReader(location.name()).canRead()) {
_current = App::pixmapFromImageInPlace(App::readImage(location.name(), 0, false)); _current = App::pixmapFromImageInPlace(App::readImage(location.name(), nullptr, false));
} }
} }
location.accessDisable(); location.accessDisable();
@ -2432,26 +2438,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
radial = _radial.animating(); radial = _radial.animating();
radialOpacity = _radial.opacity(); radialOpacity = _radial.opacity();
} }
if (_photo) { paintRadialLoading(p, radial, radialOpacity);
if (radial) {
auto inner = radialRect();
p.setPen(Qt::NoPen);
p.setOpacity(radialOpacity);
p.setBrush(st::radialBg);
{
PainterHighQualityEnabler hq(p);
p.drawEllipse(inner);
}
p.setOpacity(1);
QRect arc(inner.marginsRemoved(QMargins(st::radialLine, st::radialLine, st::radialLine, st::radialLine)));
_radial.draw(p, arc, st::radialLine, st::radialFg);
}
} else if (_doc) {
paintDocRadialLoading(p, radial, radialOpacity);
}
} }
if (_saveMsgStarted && _saveMsg.intersects(r)) { if (_saveMsgStarted && _saveMsg.intersects(r)) {
float64 dt = float64(ms) - _saveMsgStarted, hidingDt = dt - st::mediaviewSaveMsgShowing - st::mediaviewSaveMsgShown; float64 dt = float64(ms) - _saveMsgStarted, hidingDt = dt - st::mediaviewSaveMsgShowing - st::mediaviewSaveMsgShown;
@ -2508,7 +2495,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
p.drawPixmap(_docIconRect.topLeft(), _doc->thumbnail()->pix(fileOrigin(), _docThumbw), QRect(_docThumbx * rf, _docThumby * rf, st::mediaviewFileIconSize * rf, st::mediaviewFileIconSize * rf)); p.drawPixmap(_docIconRect.topLeft(), _doc->thumbnail()->pix(fileOrigin(), _docThumbw), QRect(_docThumbx * rf, _docThumby * rf, st::mediaviewFileIconSize * rf, st::mediaviewFileIconSize * rf));
} }
paintDocRadialLoading(p, radial, radialOpacity); paintRadialLoading(p, radial, radialOpacity);
} }
if (!_docIconRect.contains(r)) { if (!_docIconRect.contains(r)) {
@ -2710,47 +2697,87 @@ void OverlayWidget::paintTransformedVideoFrame(Painter &p) {
//} //}
} }
void OverlayWidget::paintDocRadialLoading(Painter &p, bool radial, float64 radialOpacity) { void OverlayWidget::paintRadialLoading(
QRect inner(QPoint(_docIconRect.x() + ((_docIconRect.width() - st::radialSize.width()) / 2), _docIconRect.y() + ((_docIconRect.height() - st::radialSize.height()) / 2)), st::radialSize); Painter &p,
bool radial,
float64 radialOpacity) {
if (_streamed) { if (_streamed) {
const auto ms = crl::now(); const auto ms = crl::now();
_streamed->radial.step(ms); _streamed->radial.step(ms);
if (!_streamed->radial.animating()) { if (!_streamed->radial.animating()) {
return; return;
} }
const auto fade = _streamed->fading.current( _streamed->fading.step(ms);
ms, if (!_streamed->fading.animating() && !_streamed->waiting) {
_streamed->waiting ? 1. : 0.);
if (fade == 0.) {
if (!_streamed->waiting) { if (!_streamed->waiting) {
_streamed->radial.stop(anim::type::instant); _streamed->radial.stop(anim::type::instant);
} }
return; return;
} }
p.setOpacity(fade); } else if (!radial && (!_doc || _doc->loaded())) {
return;
}
const auto inner = radialRect();
Assert(!inner.isEmpty());
#ifdef USE_OPENGL_OVERLAY_WIDGET
{
if (_radialCache.size() != inner.size() * cIntRetinaFactor()) {
_radialCache = QImage(
inner.size() * cIntRetinaFactor(),
QImage::Format_ARGB32_Premultiplied);
_radialCache.setDevicePixelRatio(cRetinaFactor());
}
_radialCache.fill(Qt::transparent);
Painter q(&_radialCache);
const auto moved = inner.translated(-inner.topLeft());
paintRadialLoadingContent(q, moved, radial, radialOpacity);
}
p.drawImage(inner.topLeft(), _radialCache);
#else // USE_OPENGL_OVERLAY_WIDGET
paintRadialLoadingContent(p, inner, radial, radialOpacity);
#endif // USE_OPENGL_OVERLAY_WIDGET
}
void OverlayWidget::paintRadialLoadingContent(
Painter &p,
QRect inner,
bool radial,
float64 radialOpacity) const {
const auto arc = inner.marginsRemoved(QMargins(
st::radialLine,
st::radialLine,
st::radialLine,
st::radialLine));
const auto paintBg = [&](float64 opacity, QBrush brush) {
p.setOpacity(opacity);
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
p.setBrush(st::msgDateImgBg); p.setBrush(brush);
{ {
PainterHighQualityEnabler hq(p); PainterHighQualityEnabler hq(p);
p.drawEllipse(inner); p.drawEllipse(inner);
} }
QRect arc(inner.marginsRemoved(QMargins(st::radialLine, st::radialLine, st::radialLine, st::radialLine)));
_streamed->radial.draw(p, arc.topLeft(), arc.size(), width());// , st::radialLine, st::radialFg);
} else if (radial || (_doc && !_doc->loaded())) {
float64 o = overLevel(OverIcon);
p.setPen(Qt::NoPen);
p.setOpacity(_doc->loaded() ? radialOpacity : 1.);
p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, o));
{
PainterHighQualityEnabler hq(p);
p.drawEllipse(inner);
}
p.setOpacity(1.); p.setOpacity(1.);
auto icon = [&]() -> const style::icon* { };
if (_streamed) {
paintBg(
_streamed->fading.current(_streamed->waiting ? 1. : 0.),
st::radialBg);
_streamed->radial.draw(p, arc.topLeft(), arc.size(), width());
return;
}
if (_photo) {
paintBg(radialOpacity, st::radialBg);
} else {
const auto o = overLevel(OverIcon);
paintBg(
_doc->loaded() ? radialOpacity : 1.,
anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, o));
const auto icon = [&]() -> const style::icon * {
if (radial || _doc->loading()) { if (radial || _doc->loading()) {
return &st::historyFileThumbCancel; return &st::historyFileThumbCancel;
} }
@ -2759,11 +2786,10 @@ void OverlayWidget::paintDocRadialLoading(Painter &p, bool radial, float64 radia
if (icon) { if (icon) {
icon->paintInCenter(p, inner); icon->paintInCenter(p, inner);
} }
if (radial) { }
p.setOpacity(1); if (radial) {
QRect arc(inner.marginsRemoved(QMargins(st::radialLine, st::radialLine, st::radialLine, st::radialLine))); p.setOpacity(1);
_radial.draw(p, arc, st::radialLine, st::radialFg); _radial.draw(p, arc, st::radialLine, st::radialFg);
}
} }
} }
@ -3527,7 +3553,7 @@ 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 #ifdef USE_OPENGL_OVERLAY_WIDGET
// QOpenGLWidget can't properly destroy a child widget if // QOpenGLWidget can't properly destroy a child widget if
// it is hidden exactly after that, so it must be repainted // it is hidden exactly after that, so it must be repainted
// before it is hidden without the child widget. // before it is hidden without the child widget.
@ -3545,8 +3571,7 @@ void OverlayWidget::setVisibleHook(bool visible) {
QApplication::sendEvent(this, &event); QApplication::sendEvent(this, &event);
} }
} }
#endif // Q_OS_MAC && !MAC_OS_OLD #endif // USE_OPENGL_OVERLAY_WIDGET
} }
OverlayParent::setVisibleHook(visible); OverlayParent::setVisibleHook(visible);
if (visible) { if (visible) {

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

@ -50,11 +50,15 @@ namespace View {
class GroupThumbs; class GroupThumbs;
#if defined Q_OS_MAC && !defined OS_MAC_OLD #if defined Q_OS_MAC && !defined OS_MAC_OLD
using OverlayParent = Ui::RpWidgetWrap<QOpenGLWidget>; #define USE_OPENGL_OVERLAY_WIDGET
#else // Q_OS_MAC && !OS_MAC_OLD
using OverlayParent = Ui::RpWidget;
#endif // Q_OS_MAC && !OS_MAC_OLD #endif // Q_OS_MAC && !OS_MAC_OLD
#ifdef USE_OPENGL_OVERLAY_WIDGET
using OverlayParent = Ui::RpWidgetWrap<QOpenGLWidget>;
#else // USE_OPENGL_OVERLAY_WIDGET
using OverlayParent = Ui::RpWidget;
#endif // USE_OPENGL_OVERLAY_WIDGET
class OverlayWidget final class OverlayWidget final
: public OverlayParent : public OverlayParent
, private base::Subscriber , private base::Subscriber
@ -273,7 +277,12 @@ private:
void zoomReset(); void zoomReset();
void zoomUpdate(int32 &newZoom); void zoomUpdate(int32 &newZoom);
void paintDocRadialLoading(Painter &p, bool radial, float64 radialOpacity); void paintRadialLoading(Painter &p, bool radial, float64 radialOpacity);
void paintRadialLoadingContent(
Painter &p,
QRect inner,
bool radial,
float64 radialOpacity) const;
void paintThemePreview(Painter &p, QRect clip); void paintThemePreview(Painter &p, QRect clip);
void updateOverRect(OverState state); void updateOverRect(OverState state);
@ -358,6 +367,7 @@ private:
QRect _photoRadialRect; QRect _photoRadialRect;
Ui::RadialAnimation _radial; Ui::RadialAnimation _radial;
QImage _radialCache;
History *_migrated = nullptr; History *_migrated = nullptr;
History *_history = nullptr; // if conversation photos or files overview History *_history = nullptr; // if conversation photos or files overview

4
Telegram/SourceFiles/ui/effects/radial_animation.cpp
View File

@ -76,7 +76,7 @@ void RadialAnimation::draw(
Painter &p, Painter &p,
const QRect &inner, const QRect &inner,
int32 thickness, int32 thickness,
style::color color) { style::color color) const {
const auto state = computeState(); const auto state = computeState();
auto o = p.opacity(); auto o = p.opacity();
@ -97,7 +97,7 @@ void RadialAnimation::draw(
p.setOpacity(o); p.setOpacity(o);
} }
RadialState RadialAnimation::computeState() { RadialState RadialAnimation::computeState() const {
auto length = MinArcLength + qRound(a_arcEnd.current()); auto length = MinArcLength + qRound(a_arcEnd.current());
auto from = QuarterArcLength auto from = QuarterArcLength
- length - length

4
Telegram/SourceFiles/ui/effects/radial_animation.h
View File

@ -43,9 +43,9 @@ public:
Painter &p, Painter &p,
const QRect &inner, const QRect &inner,
int32 thickness, int32 thickness,
style::color color); style::color color) const;
RadialState computeState(); RadialState computeState() const;
private: private:
crl::time _firstStart = 0; crl::time _firstStart = 0;