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

Closed beta 10019001: improved style apply for FlatButton.

This commit is contained in:
John Preston 2016-11-03 14:42:56 +03:00
parent 1466338e7e
commit 1ecd6866c7
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Telegram/SourceFiles/ui/flatbutton.cpp
View File

@ -28,8 +28,7 @@ FlatButton::FlatButton(QWidget *parent, const QString &text, const style::flatBu
, _st(st) , _st(st)
, a_bg(st.bgColor->c) , a_bg(st.bgColor->c)
, a_text(st.color->c) , a_text(st.color->c)
, _a_appearance(animation(this, &FlatButton::step_appearance)) , _a_appearance(animation(this, &FlatButton::step_appearance)) {
, _opacity(1) {
if (_st.width < 0) { if (_st.width < 0) {
_width = textWidth() - _st.width; _width = textWidth() - _st.width;
} else if (!_st.width) { } else if (!_st.width) {
@ -104,20 +103,33 @@ void FlatButton::paintEvent(QPaintEvent *e) {
QRect r(0, height() - _st.height, width(), _st.height); QRect r(0, height() - _st.height, width(), _st.height);
auto animating = _a_appearance.animating();
auto &bg = (_state & StateOver) ? ((_state & StateDown) ? _st.downBgColor : _st.overBgColor) : _st.bgColor;
auto &fg = (_state & StateOver) ? ((_state & StateDown) ? _st.downColor : _st.overColor) : _st.color;
p.setOpacity(_opacity); p.setOpacity(_opacity);
if (_st.radius > 0) { if (_st.radius > 0) {
p.setRenderHint(QPainter::HighQualityAntialiasing); p.setRenderHint(QPainter::HighQualityAntialiasing);
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
p.setBrush(QBrush(a_bg.current())); if (animating) {
p.setBrush(a_bg.current());
} else {
p.setBrush(bg);
}
p.drawRoundedRect(r, _st.radius, _st.radius); p.drawRoundedRect(r, _st.radius, _st.radius);
p.setRenderHint(QPainter::HighQualityAntialiasing, false); p.setRenderHint(QPainter::HighQualityAntialiasing, false);
} else { } else if (animating) {
p.fillRect(r, a_bg.current()); p.fillRect(r, a_bg.current());
} else {
p.fillRect(r, bg);
} }
p.setFont((_state & StateOver) ? _st.overFont : _st.font); p.setFont((_state & StateOver) ? _st.overFont : _st.font);
p.setRenderHint(QPainter::TextAntialiasing); p.setRenderHint(QPainter::TextAntialiasing);
p.setPen(a_text.current()); if (animating) {
p.setPen(a_text.current());
} else {
p.setPen(fg);
}
int32 top = (_state & StateOver) ? ((_state & StateDown) ? _st.downTextTop : _st.overTextTop) : _st.textTop; int32 top = (_state & StateOver) ? ((_state & StateDown) ? _st.downTextTop : _st.overTextTop) : _st.textTop;
r.setTop(top); r.setTop(top);

2
Telegram/SourceFiles/ui/flatbutton.h
View File

@ -54,7 +54,7 @@ private:
anim::cvalue a_bg, a_text; anim::cvalue a_bg, a_text;
Animation _a_appearance; Animation _a_appearance;
float64 _opacity; float64 _opacity = 1.;
}; };