From 3f9cf0e354f79b38e4e752803ff1e68226ebe606 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 22 Aug 2015 17:04:48 +0000
Subject: [PATCH] CtrlLib: UHD issues

git-svn-id: svn://ultimatepp.org/upp/trunk@8838 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/Frame.cpp      | 2 +-
 uppsrc/CtrlLib/MultiButton.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/uppsrc/CtrlCore/Frame.cpp b/uppsrc/CtrlCore/Frame.cpp
index 13a6621ab..c2b29e3ee 100644
--- a/uppsrc/CtrlCore/Frame.cpp
+++ b/uppsrc/CtrlCore/Frame.cpp
@@ -122,7 +122,7 @@ CtrlFrame& TopSeparatorFrame()    { return Single<TopSeparatorFrameCls>(); }
 CtrlFrame& RightSeparatorFrame()  { return Single<RightSeparatorFrameCls>(); }
 CtrlFrame& LeftSeparatorFrame()   { return Single<LeftSeparatorFrameCls>(); }
 
-CH_INT(FrameButtonWidth, 17);
+CH_INT(FrameButtonWidth, DPI(17));
 CH_INT(ScrollBarArrowSize, FrameButtonWidth());
 
 void LayoutFrameLeft(Rect& r, Ctrl *ctrl, int cx)
diff --git a/uppsrc/CtrlLib/MultiButton.cpp b/uppsrc/CtrlLib/MultiButton.cpp
index 383147491..cb466b442 100644
--- a/uppsrc/CtrlLib/MultiButton.cpp
+++ b/uppsrc/CtrlLib/MultiButton.cpp
@@ -13,15 +13,15 @@ CH_STYLE(MultiButton, Style, StyleDefault)
 		edge[i] = EditFieldEdge();
 	}
 	activeedge = false;
-	trivialborder = 1;
-	border = 1;
+	trivialborder = DPI(1);
+	border = DPI(1);
 	pressoffset = Button::StyleEdge().pressoffset;
 	sep1 = SColorHighlight();
 	sep2 = SColorLight();
-	sepm = 2;
+	sepm = DPI(2);
 	stdwidth = FrameButtonWidth();
 	trivialsep = false;
-	margin = Rect(2, 2, 2, 2);
+	margin = Rect(DPI(2), DPI(2), DPI(2), DPI(2));
 	usetrivial = false;
 	overpaint = loff = roff = 0;
 	error = Blend(LtRed(), Red());