kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Add custom brush support in RoundButton.

Browse source
This commit is contained in:
John Preston 2021-04-06 13:58:23 +04:00
parent 99089134e3
commit 8686905ee4
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ui/widgets/buttons.cpp
View file

@ -296,6 +296,11 @@ void RoundButton::setWidthChangedCallback(Fn<void()> callback) {
_numbers->setWidthChangedCallback(std::move(callback)); _numbers->setWidthChangedCallback(std::move(callback));
} }
void RoundButton::setBrushOverride(std::optional<QBrush> brush) {
_brushOverride = std::move(brush);
update();
}
void RoundButton::finishNumbersAnimation() { void RoundButton::finishNumbersAnimation() {
if (_numbers) { if (_numbers) {
_numbers->finishAnimating(); _numbers->finishAnimating();
@ -367,8 +372,12 @@ void RoundButton::paintEvent(QPaintEvent *e) {
const auto radius = rounded.height() / 2; const auto radius = rounded.height() / 2;
PainterHighQualityEnabler hq(p); PainterHighQualityEnabler hq(p);
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
p.setBrush(rect.color()); p.setBrush(_brushOverride ? *_brushOverride : rect.color()->b);
p.drawRoundedRect(fill, radius, radius); p.drawRoundedRect(fill, radius, radius);
} else if (_brushOverride) {
p.setPen(Qt::NoPen);
p.setBrush(*_brushOverride);
p.drawRoundedRect(fill, st::buttonRadius, st::buttonRadius);
} else { } else {
rect.paint(p, fill); rect.paint(p, fill);
} }
@ -377,7 +386,7 @@ void RoundButton::paintEvent(QPaintEvent *e) {
auto over = isOver(); auto over = isOver();
auto down = isDown(); auto down = isDown();
if (over || down) { if (!_brushOverride && (over || down)) {
drawRect(_roundRectOver); drawRect(_roundRectOver);
} }

2
ui/widgets/buttons.h
View file

@ -130,6 +130,7 @@ public:
setNumbersText(QString::number(numbers), numbers); setNumbersText(QString::number(numbers), numbers);
} }
void setWidthChangedCallback(Fn<void()> callback); void setWidthChangedCallback(Fn<void()> callback);
void setBrushOverride(std::optional<QBrush> brush);
void finishNumbersAnimation(); void finishNumbersAnimation();
int contentWidth() const; int contentWidth() const;
@ -165,6 +166,7 @@ private:
int _fullWidthOverride = 0; int _fullWidthOverride = 0;
const style::RoundButton &_st; const style::RoundButton &_st;
std::optional<QBrush> _brushOverride;
RoundRect _roundRect; RoundRect _roundRect;
RoundRect _roundRectOver; RoundRect _roundRectOver;