From bb2e846ac5b08aa16e14bbcdb4ec2c0eae22d67d Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 18 Jan 2020 16:12:20 +0000
Subject: [PATCH] CtrlLib: visual improvements

git-svn-id: svn://ultimatepp.org/upp/trunk@13913 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/MultiButton.cpp | 39 +++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/uppsrc/CtrlLib/MultiButton.cpp b/uppsrc/CtrlLib/MultiButton.cpp
index 1e8c519d1..946e1d7ec 100644
--- a/uppsrc/CtrlLib/MultiButton.cpp
+++ b/uppsrc/CtrlLib/MultiButton.cpp
@@ -355,6 +355,24 @@ Rect MultiButton::Paint0(Draw& w, bool getcr)
 	int border, lx, rx;
 	bool frm = Metrics(border, lx, rx);
 	int mst = ChState(MAIN);
+
+	Color fpaper = Null;
+	Color text = SColorLabel;
+	if(!nobg && !ComplexFrame() && frm) {
+		if(mst == CTRL_HOT && !IsTrivial())
+			fpaper = Blend(SColorHighlight, SColorPaper, 235);
+		else
+		if(mst == CTRL_PRESSED && !IsTrivial())
+			fpaper = Blend(SColorHighlight, SColorFace, 235);
+		else
+		if(HasFocus()) {
+			fpaper = SColorHighlight();
+			text = SColorHighlightText();
+		}
+		else
+			fpaper = IsEnabled() && IsEditable() ? SColorPaper() : SColorFace();
+	}
+
 	if(frm && !nobg && !getcr) {
 		if(style->clipedge) {
 			int l, r;
@@ -362,8 +380,9 @@ Rect MultiButton::Paint0(Draw& w, bool getcr)
 			w.Clip(l, 0, r - l, sz.cy);
 		}
 		ChPaint(w, sz, style->edge[style->activeedge ? mst : 0]);
-		if(!IsNull(paper) && !IsNull(style->coloredge))
-			ChPaint(w, sz, style->coloredge, paper);
+		Color p = Nvl(fpaper, paper);
+		if(!IsNull(p) && !IsNull(style->coloredge))
+			ChPaint(w, sz, style->coloredge, p);
 		if(style->clipedge)
 			w.End();
 	}
@@ -442,7 +461,6 @@ Rect MultiButton::Paint0(Draw& w, bool getcr)
 	cr = GetSize();
 	cr.left = lx;
 	cr.right = rx;
-	Color text = SColorLabel();
 	Color paper = Null;
 	if(!nobg) {
 		if(ComplexFrame()) {
@@ -456,20 +474,7 @@ Rect MultiButton::Paint0(Draw& w, bool getcr)
 		if(frm) {
 			Rect m = GetMargin();
 			r = Rect(max(lx, m.left), m.top, min(rx, sz.cx - m.right), sz.cy - m.bottom);
-			Color paper;
-			if(mst == CTRL_HOT && !IsTrivial())
-				paper = Blend(SColorHighlight, SColorPaper, 235);
-			else
-			if(mst == CTRL_PRESSED && !IsTrivial())
-				paper = Blend(SColorHighlight, SColorFace, 235);
-			else
-			if(HasFocus()) {
-				paper = SColorHighlight();
-				text = SColorHighlightText();
-			}
-			else
-				paper = IsEnabled() && IsEditable() ? SColorPaper() : SColorFace();
-			w.DrawRect(r, paper);
+			w.DrawRect(r, fpaper);
 			cr = r;
 		}
 		else {