From dfc0f0b889375c10782a870a377936a19fcac7f3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 11:12:46 +0400
Subject: [PATCH] Change button round radius.

---
 ui/basic.style              | 1 -
 ui/widgets/buttons.cpp      | 4 ++--
 ui/widgets/checkbox.cpp     | 2 +-
 ui/widgets/input_fields.cpp | 2 +-
 ui/widgets/tooltip.cpp      | 2 +-
 ui/widgets/widgets.style    | 2 ++
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index 3f0832e..c8b4703 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -73,7 +73,6 @@ roundRadiusLarge: 6px;
 roundRadiusSmall: 3px;
 
 dateRadius: roundRadiusLarge;
-buttonRadius: roundRadiusSmall;
 
 setLittleSkip: 9px;
 
diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index 7d7a0c3..d770d0e 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -236,8 +236,8 @@ RoundButton::RoundButton(
 : RippleButton(parent, st.ripple)
 , _textFull(std::move(text))
 , _st(st)
-, _roundRect(ImageRoundRadius::Small, _st.textBg)
-, _roundRectOver(ImageRoundRadius::Small, _st.textBgOver) {
+, _roundRect(st::buttonRadius, _st.textBg)
+, _roundRectOver(st::buttonRadius, _st.textBgOver) {
 	_textFull.value(
 	) | rpl::start_with_next([=](const QString &text) {
 		resizeToText(text);
diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index 3822d50..eefca13 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -262,7 +262,7 @@ void CheckView::paint(Painter &p, int left, int top, int outerWidth) {
 
 	{
 		PainterHighQualityEnabler hq(p);
-		p.drawRoundedRect(style::rtlrect(QRectF(left, top, _st->diameter, _st->diameter).marginsRemoved(QMarginsF(_st->thickness / 2., _st->thickness / 2., _st->thickness / 2., _st->thickness / 2.)), outerWidth), st::buttonRadius - (_st->thickness / 2.), st::buttonRadius - (_st->thickness / 2.));
+		p.drawRoundedRect(style::rtlrect(QRectF(left, top, _st->diameter, _st->diameter).marginsRemoved(QMarginsF(_st->thickness / 2., _st->thickness / 2., _st->thickness / 2., _st->thickness / 2.)), outerWidth), st::roundRadiusSmall - (_st->thickness / 2.), st::roundRadiusSmall - (_st->thickness / 2.));
 	}
 
 	if (toggled > 0) {
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index bee6c57..9d9ed90 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -1045,7 +1045,7 @@ void FlatInput::paintEvent(QPaintEvent *e) {
 	p.setBrush(anim::brush(_st.bgColor, _st.bgActive, placeholderFocused));
 	{
 		PainterHighQualityEnabler hq(p);
-		p.drawRoundedRect(QRectF(0, 0, width(), height()).marginsRemoved(QMarginsF(_st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2.)), st::buttonRadius - (_st.borderWidth / 2.), st::buttonRadius - (_st.borderWidth / 2.));
+		p.drawRoundedRect(QRectF(0, 0, width(), height()).marginsRemoved(QMarginsF(_st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2.)), st::roundRadiusSmall - (_st.borderWidth / 2.), st::roundRadiusSmall - (_st.borderWidth / 2.));
 	}
 
 	if (!_st.icon.empty()) {
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index 3899449..788756c 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -142,7 +142,7 @@ void Tooltip::paintEvent(QPaintEvent *e) {
 		p.setPen(_st->textBorder);
 		p.setBrush(_st->textBg);
 		PainterHighQualityEnabler hq(p);
-		p.drawRoundedRect(QRectF(0.5, 0.5, width() - 1., height() - 1.), st::buttonRadius, st::buttonRadius);
+		p.drawRoundedRect(QRectF(0.5, 0.5, width() - 1., height() - 1.), st::roundRadiusSmall, st::roundRadiusSmall);
 	} else {
 		p.fillRect(rect(), _st->textBg);
 
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 6fb9b39..367887e 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -626,6 +626,8 @@ defaultRippleAnimation: RippleAnimation {
 emptyRippleAnimation: RippleAnimation {
 }
 
+buttonRadius: 4px;
+
 defaultActiveButton: RoundButton {
 	textFg: activeButtonFg;
 	textFgOver: activeButtonFgOver;