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

Fixed build for Xcode. Round cap used in radial animations.

This commit is contained in:
John Preston 2016-11-28 16:42:37 +03:00
parent 3da0533339
commit 26c08236cd
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/intro/introwidget.cpp
View File

@ -768,4 +768,8 @@ void Widget::Step::finished() {
hide(); hide();
} }
Widget::Step::CoverAnimation::~CoverAnimation() = default;
Widget::Step::~Step() = default;
} // namespace Intro } // namespace Intro

7
Telegram/SourceFiles/intro/introwidget.h
View File

@ -126,6 +126,8 @@ public:
showError(QString()); showError(QString());
} }
~Step();
protected: protected:
void paintEvent(QPaintEvent *e) override; void paintEvent(QPaintEvent *e) override;
void resizeEvent(QResizeEvent *e) override; void resizeEvent(QResizeEvent *e) override;
@ -159,6 +161,11 @@ public:
private: private:
struct CoverAnimation { struct CoverAnimation {
CoverAnimation() = default;
CoverAnimation(CoverAnimation &&other) = default;
CoverAnimation &operator=(CoverAnimation &&other) = default;
~CoverAnimation();
std_::unique_ptr<Ui::CrossFadeAnimation> title; std_::unique_ptr<Ui::CrossFadeAnimation> title;
std_::unique_ptr<Ui::CrossFadeAnimation> description; std_::unique_ptr<Ui::CrossFadeAnimation> description;

5
Telegram/SourceFiles/ui/buttons/history_down_button.cpp
View File

@ -140,7 +140,10 @@ void EmojiButton::paintEvent(QPaintEvent *e) {
icon->paint(p, _st.iconPosition, width()); icon->paint(p, _st.iconPosition, width());
p.setOpacity(1.); p.setOpacity(1.);
p.setPen(QPen(over ? st::historyEmojiCircleFgOver : st::historyEmojiCircleFg, st::historyEmojiCircleLine)); auto pen = (over ? st::historyEmojiCircleFgOver : st::historyEmojiCircleFg)->p;
pen.setWidth(st::historyEmojiCircleLine);
pen.setCapStyle(Qt::RoundCap);
p.setPen(pen);
p.setBrush(Qt::NoBrush); p.setBrush(Qt::NoBrush);
p.setRenderHint(QPainter::HighQualityAntialiasing); p.setRenderHint(QPainter::HighQualityAntialiasing);

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

@ -76,6 +76,7 @@ void RadialAnimation::draw(Painter &p, const QRect &inner, int32 thickness, cons
QPen pen(color->p), was(p.pen()); QPen pen(color->p), was(p.pen());
pen.setWidth(thickness); pen.setWidth(thickness);
pen.setCapStyle(Qt::RoundCap);
p.setPen(pen); p.setPen(pen);
int32 len = MinArcLength + a_arcEnd.current(); int32 len = MinArcLength + a_arcEnd.current();