Added ability to draw outlined Ui::RoundButton.

desktop-app · Oct 7, 2021 · 1651470 · 1651470
1 parent 7182fad
commit 1651470
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
@@ -301,6 +301,11 @@ void RoundButton::setBrushOverride(std::optional<QBrush> brush) {
 	update();
 }
 
+void RoundButton::setPenOverride(std::optional<QPen> pen) {
+	_penOverride = std::move(pen);
+	update();
+}
+
 void RoundButton::finishNumbersAnimation() {
 	if (_numbers) {
 		_numbers->finishAnimating();
@@ -371,18 +376,22 @@ void RoundButton::paintEvent(QPaintEvent *e) {
 		if (_fullRadius) {
 			const auto radius = rounded.height() / 2;
 			PainterHighQualityEnabler hq(p);
-			p.setPen(Qt::NoPen);
+			p.setPen(_penOverride ? *_penOverride : Qt::NoPen);
 			p.setBrush(_brushOverride ? *_brushOverride : rect.color()->b);
 			p.drawRoundedRect(fill, radius, radius);
 		} else if (_brushOverride) {
-			p.setPen(Qt::NoPen);
+			PainterHighQualityEnabler hq(p);
+			p.setPen(_penOverride ? *_penOverride : Qt::NoPen);
 			p.setBrush(*_brushOverride);
 			const auto radius = _st.radius ? _st.radius : st::buttonRadius;
 			p.drawRoundedRect(fill, radius, radius);
 		} else {
 			rect.paint(p, fill);
 		}
 	};
+	if (_penOverride) {
+		paintRipple(p, rounded.topLeft());
+	}
 	drawRect(_roundRect);
 
 	auto over = isOver();
@@ -391,7 +400,9 @@ void RoundButton::paintEvent(QPaintEvent *e) {
 		drawRect(_roundRectOver);
 	}
 
-	paintRipple(p, rounded.topLeft());
+	if (!_penOverride) {
+		paintRipple(p, rounded.topLeft());
+	}
 
 	p.setFont(_st.font);
 	const auto textTop = _st.padding.top() + _st.textTop;

diff --git a/ui/widgets/buttons.h b/ui/widgets/buttons.h
@@ -131,6 +131,7 @@ class RoundButton : public RippleButton {
 	}
 	void setWidthChangedCallback(Fn<void()> callback);
 	void setBrushOverride(std::optional<QBrush> brush);
+	void setPenOverride(std::optional<QPen> pen);
 	void finishNumbersAnimation();
 
 	int contentWidth() const;
@@ -167,6 +168,7 @@ class RoundButton : public RippleButton {
 
 	const style::RoundButton &_st;
 	std::optional<QBrush> _brushOverride;
+	std::optional<QPen> _penOverride;
 	RoundRect _roundRect;
 	RoundRect _roundRectOver;