kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Make radio button closer to guidelines.

Browse source
This commit is contained in:
John Preston 2021-01-15 15:40:06 +04:00
parent 9ebd51c8f8
commit 239cec923f
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ui/widgets/checkbox.cpp
View file

@ -320,7 +320,8 @@ void RadioView::paint(Painter &p, int left, int top, int outerWidth) {
p.setBrush(_st->bg); p.setBrush(_st->bg);
//int32 skip = qCeil(_st->thickness / 2.); //int32 skip = qCeil(_st->thickness / 2.);
//p.drawEllipse(_checkRect.marginsRemoved(QMargins(skip, skip, skip, skip))); //p.drawEllipse(_checkRect.marginsRemoved(QMargins(skip, skip, skip, skip)));
p.drawEllipse(style::rtlrect(QRectF(left, top, _st->diameter, _st->diameter).marginsRemoved(QMarginsF(_st->thickness / 2., _st->thickness / 2., _st->thickness / 2., _st->thickness / 2.)), outerWidth)); const auto skip = (_st->outerSkip / 10.) + (_st->thickness / 2);
p.drawEllipse(style::rtlrect(QRectF(left, top, _st->diameter, _st->diameter).marginsRemoved(QMarginsF(skip, skip, skip, skip)), outerWidth));
if (toggled > 0) { if (toggled > 0) {
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
@ -332,7 +333,7 @@ void RadioView::paint(Painter &p, int left, int top, int outerWidth) {
? anim::brush(*_untoggledOverride, _st->toggledFg, toggled) ? anim::brush(*_untoggledOverride, _st->toggledFg, toggled)
: anim::brush(_st->untoggledFg, _st->toggledFg, toggled))); : anim::brush(_st->untoggledFg, _st->toggledFg, toggled)));
auto skip0 = _st->diameter / 2., skip1 = _st->skip / 10., checkSkip = skip0 * (1. - toggled) + skip1 * toggled; const auto skip0 = _st->diameter / 2., skip1 = _st->skip / 10., checkSkip = skip0 * (1. - toggled) + skip1 * toggled;
p.drawEllipse(style::rtlrect(QRectF(left, top, _st->diameter, _st->diameter).marginsRemoved(QMarginsF(checkSkip, checkSkip, checkSkip, checkSkip)), outerWidth)); p.drawEllipse(style::rtlrect(QRectF(left, top, _st->diameter, _st->diameter).marginsRemoved(QMarginsF(checkSkip, checkSkip, checkSkip, checkSkip)), outerWidth));
//int32 fskip = qFloor(checkSkip), cskip = qCeil(checkSkip); //int32 fskip = qFloor(checkSkip), cskip = qCeil(checkSkip);
//if (2 * fskip < _checkRect.width()) { //if (2 * fskip < _checkRect.width()) {

4
ui/widgets/widgets.style
View file

@ -135,6 +135,7 @@ Radio {
toggledFg: color; toggledFg: color;
diameter: pixels; diameter: pixels;
thickness: pixels; thickness: pixels;
outerSkip: pixels;
skip: pixels; skip: pixels;
duration: int; duration: int;
rippleAreaPadding: pixels; rippleAreaPadding: pixels;
@ -741,7 +742,8 @@ defaultRadio: Radio {
toggledFg: windowBgActive; toggledFg: windowBgActive;
diameter: 22px; diameter: 22px;
thickness: 2px; thickness: 2px;
skip: 65px; // * 0.1 outerSkip: 10px; // * 0.1
skip: 60px; // * 0.1
duration: 120; duration: 120;
rippleAreaPadding: 8px; rippleAreaPadding: 8px;
} }