From 26b381bcefca490974b63a13f9844f080af5d1c2 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 9 Aug 2015 11:14:16 +0000
Subject: [PATCH] upp.src: UHD issues

git-svn-id: svn://ultimatepp.org/upp/trunk@8803 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CodeEditor/CodeEditor.cpp |  2 +-
 uppsrc/CtrlCore/CtrlCore.h       |  5 +++--
 uppsrc/CtrlLib/ColorPusher.cpp   |  1 -
 uppsrc/CtrlLib/Help.cpp          |  2 +-
 uppsrc/CtrlLib/LineEdit.cpp      |  4 ++--
 uppsrc/CtrlLib/MenuItem.cpp      |  4 ++--
 uppsrc/CtrlLib/TreeCtrl.cpp      |  2 +-
 uppsrc/Draw/ImageOp.h            |  3 +++
 uppsrc/Draw/Uhd.cpp              | 11 +++++++++++
 uppsrc/Esc/Esc.upp               |  2 +-
 uppsrc/HexView/HexView.cpp       |  6 +++---
 uppsrc/IconDes/RGBACtrl.cpp      |  2 +-
 uppsrc/Painter/Painter.upp       |  2 +-
 uppsrc/TextDiffCtrl/TextCtrl.cpp |  2 +-
 uppsrc/ide/About.cpp             |  2 +-
 uppsrc/ide/Debuggers/Dbg.cpp     |  2 +-
 uppsrc/ide/Debuggers/Disas.cpp   |  4 ++--
 uppsrc/ide/Debuggers/Gdb_MI2.cpp |  2 +-
 uppsrc/ide/LayDes/fontprop.cpp   |  6 +++---
 uppsrc/ide/LayDes/visgen.cpp     |  4 ++--
 uppsrc/ide/SelectPkg.cpp         |  5 +++--
 uppsrc/ide/Template.cpp          |  6 +++---
 uppsrc/ide/ide.upp               |  2 +-
 uppsrc/ide/idewin.cpp            |  4 ++--
 uppsrc/usvn/SvnSync.cpp          |  6 +++---
 25 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/uppsrc/CodeEditor/CodeEditor.cpp b/uppsrc/CodeEditor/CodeEditor.cpp
index f44c82a32..40c89f2be 100644
--- a/uppsrc/CodeEditor/CodeEditor.cpp
+++ b/uppsrc/CodeEditor/CodeEditor.cpp
@@ -968,7 +968,7 @@ CodeEditor::CodeEditor() {
 	bracket_start = 0;
 	stat_edit_time = 0;
 	last_key_time = Null;
-	SetFont(Courier(16));
+	SetFont(CourierZ(16));
 	AddFrame(bar);
 	bar.SetEditor(this);
 	UndoSteps(10000);
diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
index f4e7f276a..334652c52 100644
--- a/uppsrc/CtrlCore/CtrlCore.h
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -1267,8 +1267,9 @@ void   GuiPlatformGripResize(TopWindow *q);
 Color  GuiPlatformGetScreenPixel(int x, int y);
 void   GuiPlatformAfterMenuPopUp();
 
-inline int Zx(int cx) { return Ctrl::HorzLayoutZoom(cx); }
-inline int Zy(int cy) { return Ctrl::VertLayoutZoom(cy); }
+inline int  Zx(int cx) { return Ctrl::HorzLayoutZoom(cx); }
+inline int  Zy(int cy) { return Ctrl::VertLayoutZoom(cy); }
+inline Size Zsz(int cx, int cy) { return Size(Zx(cx), Zy(cy)); }
 
 Font FontZ(int face, int height = 0);
 
diff --git a/uppsrc/CtrlLib/ColorPusher.cpp b/uppsrc/CtrlLib/ColorPusher.cpp
index 417f2111b..99cfe0ad4 100644
--- a/uppsrc/CtrlLib/ColorPusher.cpp
+++ b/uppsrc/CtrlLib/ColorPusher.cpp
@@ -120,7 +120,6 @@ void ColorButton::Paint(Draw& w)
 {
 	Size sz = GetSize();
 	Size isz = (IsNull(image) ? staticimage : image).GetSize();
-	DDUMP(image.GetSize());
 	Point center = (sz - isz) / 2;
 	if(GUI_GlobalStyle() >= GUISTYLE_XP)
 		ChPaint(w, sz, style->look[!IsEnabled() ? CTRL_DISABLED : push ? CTRL_PRESSED
diff --git a/uppsrc/CtrlLib/Help.cpp b/uppsrc/CtrlLib/Help.cpp
index c5a848162..60884619d 100644
--- a/uppsrc/CtrlLib/Help.cpp
+++ b/uppsrc/CtrlLib/Help.cpp
@@ -88,7 +88,7 @@ void HelpWindow::Forward()
 
 void HelpWindow::SetZoom()
 {
-	zoom.d = 1000;
+	zoom.d = 1000000 / Zy(1000);
 	current_link = Null;
 	GoTo0(topic);
 	Refresh();
diff --git a/uppsrc/CtrlLib/LineEdit.cpp b/uppsrc/CtrlLib/LineEdit.cpp
index 5171bd00f..263684961 100644
--- a/uppsrc/CtrlLib/LineEdit.cpp
+++ b/uppsrc/CtrlLib/LineEdit.cpp
@@ -9,7 +9,7 @@ LineEdit::LineEdit() {
 	nohbar = false;
 	showtabs = false;
 	tabsize = 4;
-	font = Courier(16);
+	font = CourierZ(16);
 	SetFrame(ViewFrame());
 	sb.NoBox();
 	AddFrame(sb);
@@ -1190,7 +1190,7 @@ void LineEdit::LeftDrag(Point p, dword flags)
 		ImageDraw iw(sz);
 		iw.DrawRect(sz, Black());
 		iw.Alpha().DrawRect(sz, Black());
-		DrawTLText(iw.Alpha(), 0, 0, 9999, sample, Courier(10), White());
+		DrawTLText(iw.Alpha(), 0, 0, 9999, sample, CourierZ(10), White());
 		NextUndo();
 		if(DoDragAndDrop(ClipFmtsText(), iw) == DND_MOVE && !IsReadOnly()) {
 			RemoveSelection();
diff --git a/uppsrc/CtrlLib/MenuItem.cpp b/uppsrc/CtrlLib/MenuItem.cpp
index 1e9bf7817..6760f0164 100644
--- a/uppsrc/CtrlLib/MenuItem.cpp
+++ b/uppsrc/CtrlLib/MenuItem.cpp
@@ -646,12 +646,12 @@ bool TopMenuItem::Key(dword key, int count)
 
 Size TopMenuItem::GetMinSize() const
 {
-	return AddFrameSize(GetTextSize(text, StdFont()) + Size(12, 7));
+	return AddFrameSize(GetTextSize(text, StdFont()) + Zsz(12, 7));
 }
 
 int TopMenuItem::GetStdHeight(Font font)
 {
-	return font.Info().GetHeight() + 7;
+	return font.Info().GetHeight() + Zy(7);
 }
 
 void TopMenuItem::SyncState()
diff --git a/uppsrc/CtrlLib/TreeCtrl.cpp b/uppsrc/CtrlLib/TreeCtrl.cpp
index 720aa54fd..5e0d6a4b0 100644
--- a/uppsrc/CtrlLib/TreeCtrl.cpp
+++ b/uppsrc/CtrlLib/TreeCtrl.cpp
@@ -56,7 +56,7 @@ TreeCtrl::Node::Node(const Image& img, Ctrl& ctrl, int cx, int cy)
 TreeCtrl::TreeCtrl()
 {
 	display = &StdDisplay();
-	levelcx = 16;
+	levelcx = DPI(16);
 	nocursor = false;
 	noroot = false;
 	dirty = true;
diff --git a/uppsrc/Draw/ImageOp.h b/uppsrc/Draw/ImageOp.h
index 7e82a952d..7aaf5fb0e 100644
--- a/uppsrc/Draw/ImageOp.h
+++ b/uppsrc/Draw/ImageOp.h
@@ -202,4 +202,7 @@ void SetUHDMode(bool b = true);
 bool IsUHDMode();
 
 Image DPI(const Image& m);
+Image DPI(const Image& img, int expected);
+
+inline int   DPI(int a)   { return IsUHDMode() ? 2 * a : a; }
 inline Size  DPI(Size sz) { return IsUHDMode() ? 2 * sz : sz; }
diff --git a/uppsrc/Draw/Uhd.cpp b/uppsrc/Draw/Uhd.cpp
index 09590dc27..08da524bb 100644
--- a/uppsrc/Draw/Uhd.cpp
+++ b/uppsrc/Draw/Uhd.cpp
@@ -37,4 +37,15 @@ Image DPI(const Image& img)
 	return img;
 }
 
+Image DPI(const Image& img, int expected)
+{
+	if(img.GetSize().cy <= expected && IsUHDMode()) {
+		Image m = CachedRescale(img, 2 * img.GetSize(), FILTER_LANCZOS3);
+		ImageBuffer h(m);
+		h.SetResolution(IMAGE_RESOLUTION_UHD);
+		return h;
+	}
+	return img;
+}
+
 };
\ No newline at end of file
diff --git a/uppsrc/Esc/Esc.upp b/uppsrc/Esc/Esc.upp
index 045b19166..b0e51e77c 100644
--- a/uppsrc/Esc/Esc.upp
+++ b/uppsrc/Esc/Esc.upp
@@ -6,7 +6,7 @@ uses
 	Core;
 
 file
-	Esc.h options PCH,
+	Esc.h options(BUILDER_OPTION) PCH,
 	EscValue.cpp,
 	EscArray.cpp,
 	EscMap.cpp,
diff --git a/uppsrc/HexView/HexView.cpp b/uppsrc/HexView/HexView.cpp
index d96fbeef9..5eae2f991 100644
--- a/uppsrc/HexView/HexView.cpp
+++ b/uppsrc/HexView/HexView.cpp
@@ -128,7 +128,7 @@ void HexViewInfo::Paint(Draw& w)
 void HexViewInfo::SetMode(int _mode)
 {
 	mode = _mode;
-	Height(mode * GetTextSize("X", Courier(12)).cy + 3);
+	Height(mode * GetTextSize("X", CourierZ(12)).cy + 3);
 	Show(mode);
 }
 
@@ -137,7 +137,7 @@ HexViewInfo::HexViewInfo()
 	SetMode(0);
 	AddFrame(TopSeparatorFrame());
 	AddFrame(RightSeparatorFrame());
-	font = Courier(12);
+	font = CourierZ(12);
 }
 
 int HexView::Byte(int64 adr)
@@ -466,7 +466,7 @@ void  HexView::SerializeSettings(Stream& s)
 
 HexView::HexView()
 {
-	SetFont(Courier(12));
+	SetFont(CourierZ(12));
 	BackPaint();
 	charset = CHARSET_WIN1252;
 	sb <<= THISBACK(Scroll);
diff --git a/uppsrc/IconDes/RGBACtrl.cpp b/uppsrc/IconDes/RGBACtrl.cpp
index 76836833b..720b62ff5 100644
--- a/uppsrc/IconDes/RGBACtrl.cpp
+++ b/uppsrc/IconDes/RGBACtrl.cpp
@@ -191,7 +191,7 @@ RGBACtrl::RGBACtrl()
 	ramp <<= THISBACK(Ramp);
 	Add(alpha);
 	alpha <<= THISBACK(Alpha);
-	text.SetFont(Courier(11));
+	text.SetFont(CourierZ(11));
 	text.NoWantFocus();
 	text.SetReadOnly();
 	Add(text);
diff --git a/uppsrc/Painter/Painter.upp b/uppsrc/Painter/Painter.upp
index 75a73599a..f84e5eab9 100644
--- a/uppsrc/Painter/Painter.upp
+++ b/uppsrc/Painter/Painter.upp
@@ -4,7 +4,7 @@ uses
 	Draw;
 
 file
-	Painter.h options PCH,
+	Painter.h options(BUILDER_OPTION) PCH,
 	Painter.hpp,
 	Painter.cpp,
 	SvgArc.cpp,
diff --git a/uppsrc/TextDiffCtrl/TextCtrl.cpp b/uppsrc/TextDiffCtrl/TextCtrl.cpp
index c79bdc366..3ef213cd4 100644
--- a/uppsrc/TextDiffCtrl/TextCtrl.cpp
+++ b/uppsrc/TextDiffCtrl/TextCtrl.cpp
@@ -13,7 +13,7 @@ TextCompareCtrl::TextCompareCtrl()
 	number_bg = WhiteGray();
 	SetFrame(FieldFrame());
 	AddFrame(scroll);
-	SetFont(Courier(Zy(14)), Courier(Zy(10)));
+	SetFont(CourierZ(14), CourierZ(10));
 	scroll.NoAutoHide();
 	scroll.WhenScroll = THISBACK(SelfScroll);
 	maxwidth = 0;
diff --git a/uppsrc/ide/About.cpp b/uppsrc/ide/About.cpp
index 272e1f4fb..d75388fdf 100644
--- a/uppsrc/ide/About.cpp
+++ b/uppsrc/ide/About.cpp
@@ -13,7 +13,7 @@
 
 Size MakeLogo(Ctrl& parent, Array<Ctrl>& ctrl)
 {
-	Image logo = DPI(IdeImg::logo(), 9999);
+	Image logo = IdeImg::logo();
 	Size  isz = logo.GetSize();
 	ImageCtrl& l = ctrl.Create<ImageCtrl>();
 	Label& v1 = ctrl.Create<Label>();
diff --git a/uppsrc/ide/Debuggers/Dbg.cpp b/uppsrc/ide/Debuggers/Dbg.cpp
index 26925834a..379fc79cb 100644
--- a/uppsrc/ide/Debuggers/Dbg.cpp
+++ b/uppsrc/ide/Debuggers/Dbg.cpp
@@ -236,7 +236,7 @@ Dbg::Dbg()
 	CtrlLayoutOKCancel(quickwatch, "Quick watch");
 	quickwatch.WhenClose = quickwatch.Breaker(IDCANCEL);
 	quickwatch.value.SetReadOnly();
-	quickwatch.value.SetFont(Courier(12));
+	quickwatch.value.SetFont(CourierZ(12));
 	quickwatch.Sizeable().Zoomable();
 	quickwatch.NoCenter();
 	quickwatch.SetRect(0, 150, 300, 400);
diff --git a/uppsrc/ide/Debuggers/Disas.cpp b/uppsrc/ide/Debuggers/Disas.cpp
index f5f6d43e9..f0cf315c9 100644
--- a/uppsrc/ide/Debuggers/Disas.cpp
+++ b/uppsrc/ide/Debuggers/Disas.cpp
@@ -7,7 +7,7 @@ void DbgDisas::MouseWheel(Point, int zdelta, dword)
 
 Size DbgDisas::GetBox() const
 {
-	Size sz = GetTextSize("12345678", Courier(12));
+	Size sz = GetTextSize("12345678", CourierZ(12));
 	if(mode64)
 		sz.cx *= 2;
 	return sz;
@@ -24,7 +24,7 @@ void DbgDisas::Paint(Draw& w)
 	Size box = GetBox();
 	int i = sb;
 	int y = 0;
-	Font hexfont = Courier(12);
+	Font hexfont = CourierZ(12);
 	int maxb = 0;
 	for(int i = 0; i < inst.GetCount(); i++)
 		maxb = max(inst[i].bytes.GetCount(), maxb);
diff --git a/uppsrc/ide/Debuggers/Gdb_MI2.cpp b/uppsrc/ide/Debuggers/Gdb_MI2.cpp
index 3f3bddc81..b808ecde8 100644
--- a/uppsrc/ide/Debuggers/Gdb_MI2.cpp
+++ b/uppsrc/ide/Debuggers/Gdb_MI2.cpp
@@ -430,7 +430,7 @@ Gdb_MI2::Gdb_MI2()
 	quickwatch.evaluate.Ok() <<= quickwatch.Acceptor(IDOK);
 	quickwatch.WhenClose = quickwatch.Breaker(IDCANCEL);
 	quickwatch.value.SetReadOnly();
-	quickwatch.value.SetFont(Courier(12));
+	quickwatch.value.SetFont(CourierZ(12));
 	quickwatch.value.SetColor(TextCtrl::PAPER_READONLY, White);
 	quickwatch.Sizeable().Zoomable();
 	quickwatch.NoCenter();
diff --git a/uppsrc/ide/LayDes/fontprop.cpp b/uppsrc/ide/LayDes/fontprop.cpp
index d1ca5a669..08362b1fb 100644
--- a/uppsrc/ide/LayDes/fontprop.cpp
+++ b/uppsrc/ide/LayDes/fontprop.cpp
@@ -119,15 +119,15 @@ void FontProperty::Read(CParser& p) {
 	else
 	if(p.Id("Serif") || p.Id("SerifZ") || p.Id("ScreenSerif") || p.Id("ScreenSerifZ") ||
 	   p.Id("Roman") || p.Id("RomanZ"))
-	   	f.Face(Font::SERIF);
+		f.Face(Font::SERIF);
 	else
 	if(p.Id("SansSerif") || p.Id("SansSerifZ") || p.Id("ScreenSans") || p.Id("ScreenSansZ") ||
 	   p.Id("Arial") || p.Id("ArialZ"))
-	   	f.Face(Font::SANSSERIF);
+		f.Face(Font::SANSSERIF);
 	else
 	if(p.Id("Monospace") || p.Id("MonospaceZ") || p.Id("ScreenFixed") || p.Id("ScreenFixedZ") ||
 	   p.Id("Courier") || p.Id("CourierZ"))
-	   	f.Face(Font::MONOSPACE);
+		f.Face(Font::MONOSPACE);
 	p.PassChar('(');
 	if(p.IsInt())
 		f.Height(p.ReadInt());
diff --git a/uppsrc/ide/LayDes/visgen.cpp b/uppsrc/ide/LayDes/visgen.cpp
index 723ed2f5e..66ad7c42a 100644
--- a/uppsrc/ide/LayDes/visgen.cpp
+++ b/uppsrc/ide/LayDes/visgen.cpp
@@ -209,12 +209,12 @@ VisGenDlg::VisGenDlg(LayoutData& layout, const Vector<int>& cursor)
 	label2 <<=
 	toupper2 <<=
 	quotes2 <<=
-	name2 <<= 
+	name2 <<=
 	buttons <<= THISBACK(Refresh);
 	Refresh();
 	view.Highlight("cpp");
 	view.HideBar();
-	view.SetFont(Courier(12));
+	view.SetFont(CourierZ(12));
 	if(cursor.GetCount())
 		sel <<= cursor;
 	else
diff --git a/uppsrc/ide/SelectPkg.cpp b/uppsrc/ide/SelectPkg.cpp
index c9d3ee408..b6e80a054 100644
--- a/uppsrc/ide/SelectPkg.cpp
+++ b/uppsrc/ide/SelectPkg.cpp
@@ -398,7 +398,8 @@ struct PackageDisplay : Display {
 		Image icon = va[1];
 		if(IsNull(icon))
 			icon = IdeImg::Package();
-		icon = DPI(icon);
+		else
+			icon = DPI(icon, 16);
 		w.DrawRect(r, paper);
 		w.DrawImage(r.left, r.top + (r.Height() - icon.GetHeight()) / 2, icon);
 		w.DrawText(r.left + Zx(20), r.top + (r.Height() - Draw::GetStdFontCy()) / 2, txt, fnt, ink);
@@ -558,7 +559,7 @@ void SelectPackageDlg::Load()
 						}
 					}
 				}
-				else 
+				else
 					nest.Unlink(i); // cached folder was deleted
 				ScanFolder(path, nest, d.nest, dir_exists, d.package + '/');
 			}
diff --git a/uppsrc/ide/Template.cpp b/uppsrc/ide/Template.cpp
index 2eb7b8b4d..dfa6ff37e 100644
--- a/uppsrc/ide/Template.cpp
+++ b/uppsrc/ide/Template.cpp
@@ -101,20 +101,20 @@ void AppPreview::MouseWheel(Point p, int zdelta, dword keyflags) {
 void AppPreview::Layout()
 {
 	sb.SetTotal(line.GetCount());
-	sb.SetPage(GetSize().cy / Courier(12).Info().GetHeight());
+	sb.SetPage(GetSize().cy / CourierZ(12).GetHeight());
 }
 
 void AppPreview::Paint(Draw& w)
 {
 	Size sz = GetSize();
-	FontInfo fi = Courier(12).Info();
+	FontInfo fi = CourierZ(12).Info();
 	int y = 0;
 	int i = sb;
 	while(y < sz.cy) {
 		bool hdr = i < line.GetCount() && line[i].header;
 		w.DrawRect(0, y, sz.cx, fi.GetHeight(), hdr ? LtCyan : SColorPaper);
 		if(i < line.GetCount())
-			w.DrawText(0, y, line[i].text, hdr ? Arial(12).Bold().Italic() : Courier(12), SColorText);
+			w.DrawText(0, y, line[i].text, hdr ? ArialZ(12).Bold().Italic() : CourierZ(12), SColorText);
 		y += fi.GetHeight();
 		i++;
 	}
diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp
index ddbe892c9..221ecc565 100644
--- a/uppsrc/ide/ide.upp
+++ b/uppsrc/ide/ide.upp
@@ -114,6 +114,6 @@ mainconfig
 	"" = "GUI MT TEST_HIDPI";
 
 custom() "",
-	"",
+	"ASDFASDFASDF",
 	"$(OUTDIR)/$(FILE).obj";
 
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index 001d351af..59f49693c 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -511,8 +511,8 @@ Ide::Ide()
 
 	Icon(IdeImg::Package(), IdeImg::Package());
 
-	tfont = editorfont = font2 = Courier(13);
-	veditorfont = consolefont = font1 = Courier(11);
+	tfont = editorfont = font2 = CourierZ(13);
+	veditorfont = consolefont = font1 = CourierZ(11);
 	editortabsize = 4;
 	indent_amount = 4;
 	indent_spaces = false;
diff --git a/uppsrc/usvn/SvnSync.cpp b/uppsrc/usvn/SvnSync.cpp
index b0ca11fb3..25023f9b2 100644
--- a/uppsrc/usvn/SvnSync.cpp
+++ b/uppsrc/usvn/SvnSync.cpp
@@ -50,9 +50,9 @@ void SvnSync::SyncList()
 		String path = GetFullPath(w.working);
 		list.Add(REPOSITORY, path,
 		         AttrText("Working directory").SetFont(StdFont().Bold()).Ink(White).Paper(Blue),
-		         AttrText(path).SetFont(Arial(20).Bold()).Paper(Blue).Ink(White),
-		         AttrText("").SetFont(Arial(20).Bold()).Paper(Blue).Ink(White));
-		list.SetLineCy(list.GetCount() - 1, 26);
+		         AttrText(path).SetFont(ArialZ(20).Bold()).Paper(Blue).Ink(White),
+		         AttrText("").SetFont(ArialZ(20).Bold()).Paper(Blue).Ink(White));
+		list.SetLineCy(list.GetCount() - 1, Zy(26));
 		Vector<String> ln = Split(Sys("svn status " + path), CharFilterCrLf);
 		bool actions = false;
 		for(int pass = 0; pass < 2; pass++)