.developing hidpi

git-svn-id: svn://ultimatepp.org/upp/trunk@8475 f0d560ea-af0d-0410-9eb7-867de7ffcac7

uppsrc/CtrlCore/Ctrl.cpp

@@ -965,6 +965,7 @@ CH_INT(GUI_AKD_Conservative, 0);
 CH_INT(GUI_DragDistance, 4);
 CH_INT(GUI_DblClickTime, 500);
 CH_INT(GUI_WheelScrollLines, 3);
+CH_INT(GUI_HiDPI, 0);
 
 String Ctrl::Name0() const {
 	GuiLock __;

uppsrc/CtrlCore/CtrlCore.h

@@ -1302,6 +1302,8 @@ int GUI_DragDistance();
 int GUI_DblClickTime();
 int GUI_WheelScrollLines();
 
+int GUI_HiDPI();
+
 void GUI_GlobalStyle_Write(int);
 void GUI_DragFullWindow_Write(int);
 void GUI_PopUpEffect_Write(int);
@@ -1312,6 +1314,7 @@ void GUI_AKD_Conservative_Write(int);
 void GUI_DragDistance_Write(int);
 void GUI_DblClickTime_Write(int);
 void GUI_WheelScrollLines_Write(int);
+void GUI_HiDPI_Write(int);
 
 void  EditFieldIsThin_Write(int);
 void  TopSeparator1_Write(Value);

uppsrc/CtrlLib/Bar.h

@@ -227,6 +227,8 @@ public:
 	void  PaintBar(Draw& w, const SeparatorCtrl::Style& ss,
 	               const Value& pane, const Value& iconbar = Null, int iconsz = 0);
 
+	int      GetHeight() const           { return pane.GetPaneSize(true, INT_MAX).cy; }
+
 	BarCtrl& Align(int align);
 	BarCtrl& Top()                       { return Align(BAR_TOP); }
 	BarCtrl& Bottom()                    { return Align(BAR_BOTTOM); }

uppsrc/CtrlLib/LabelBase.cpp

@@ -2,6 +2,11 @@
 
 NAMESPACE_UPP
 
+Image DPI(const Image& img)
+{
+	return GUI_HiDPI() ? CachedRescale(img, 2 * img.GetSize(), FILTER_LANCZOS3) : img;
+}
+
 void CtrlsImageLook(Value *look, int i, int n)
 {
 	while(n--)

uppsrc/CtrlLib/LabelBase.h

@@ -1,3 +1,5 @@
+Image DPI(const Image& img);
+
 enum {
 	CTRL_NORMAL, CTRL_HOT, CTRL_PRESSED, CTRL_DISABLED,
 	CTRL_CHECKED, CTRL_HOTCHECKED

uppsrc/CtrlLib/ToolButton.cpp

@@ -164,7 +164,9 @@ Image ToolButton::GetImage() const
 	UPP::Image m = img;
 	if(IsDarkColorFace() && !nodarkadjust)
 		m = MakeImage(m, AdjustForDarkBk);
-	return CachedRescale(m, min(m.GetSize(), maxiconsize));
+	m = CachedRescale(m, min(m.GetSize(), maxiconsize));
+	m = DPI(m);
+	return m;
 }
 
 Bar::Item& ToolButton::Image(const UPP::Image& img_)

uppsrc/CtrlLib/src.tpp/ToolBar$en-us.tpp

@@ -17,22 +17,7 @@ rCtrl]&]
 [s0;%% &]
 [s2;%% 
 @@image:2300&162
-€凁仛€€€冩<EFBFBD>€€€€鴱滍澩顡敝悁<EFBFBD>純徢罆朕鶅钙筻€悞萝獱ㄅ€偍暊牏螖惔⑩聭<EFBFBD>詴寢〾颀粸<EFBFBD>
-<EFBFBD>擊<EFBFBD>焰呋炟逎瘞栈蜅菋ッ浒屆皩枬胭輫黝蘧迈<EFBFBD>张侦蹀鴨徼牅艩更<EFBFBD><EFBFBD>噿啖幹蒸递酎<EFBFBD>類
-绀<EFBFBD>程栴㈤偫统敊<EFBFBD>Ρ嫪í忡莿楛悸鹁岫倐箵蕻<EFBFBD>険搜<EFBFBD>漠<EFBFBD><EFBFBD>忑替镒罪<EFBFBD><EFBFBD>劆帞鞊簹堳檗掄
-粉诗屛<EFBFBD>支<EFBFBD><EFBFBD>齻偃<EFBFBD>剼驻ム撦潏耆<EFBFBD>尽€澃詢斠属郝豌滎玖鋿黹摿埑岫睐<EFBFBD>♀撶嫢飷丕勝<EFBFBD>
-暉笓愩<EFBFBD><EFBFBD><EFBFBD>倻⑿鹕乳鏅熻椁灍齻饓笩徥溇氜葵<EFBFBD>穭€饓垪諝氲▊撺筒櫽錀傍镓頍鄤<EFBFBD>雲帗虧荒
-磼獩窭烀斾痔<EFBFBD>底轳<EFBFBD>灃<EFBFBD><EFBFBD><EFBFBD>花ň劶<EFBFBD>崅铪墥如魰圻貗灖蒡魷捆鶃壩劥跋猥<EFBFBD>葦靺脉礁槖
-<EFBFBD>熶硰戀ザ蠈柒<EFBFBD><EFBFBD>榍鍢熳瑴煙打蓳非潥藯瘹<EFBFBD><EFBFBD>南鬅幢儺鼥皫萱煊颇跄备剩侃<EFBFBD>影嵙嗔偏ザ骅
-棥浺Л搏敾繎駲炔捑冽<EFBFBD>袧<EFBFBD>澡<EFBFBD>烆螅摎唆詿潲<EFBFBD>諟梿闯谋灵乌殘櫹⿻抉謻螠杨猖挸髩腾⑵<EFBFBD>
-洢檯<EFBFBD>涡姒拰霄隹辱谭濏徒ㄏ鹱殦<EFBFBD>兣幘杉崌扉陜扅鉁仲魤茖蠈萧鷫摳垷∝佦鍠魔卤櫲簿<EFBFBD>
-橱汆韩<EFBFBD><EFBFBD>僭齄倴砂姰堙链佫愉恻射嫶垼貨槞幫<EFBFBD>勵柜囯蛹鯎<EFBFBD><EFBFBD><EFBFBD>亜┨<EFBFBD>栂喅掻⿷摕剔<EFBFBD>陛
-骣鲼菘欈僻<EFBFBD>劊港威衻谶鐑∴寚駣袃倕彄屫粗厗覠蕊<EFBFBD>ㄘ珱う硿艧疙薛戱浬墹銚钳笍溤楜潩
-<EFBFBD>淫妍諄虂劈頀騾鄧<EFBFBD>斸兮<EFBFBD><EFBFBD><EFBFBD>嚞嶄Ψ瑔<EFBFBD>弊鑫獐仓鷫踪嘂<EFBFBD>龍缣蜱<EFBFBD>撘什戜羁<EFBFBD>葩儎師鲌
-丙<EFBFBD>婎撃嚆鼪嗥罉荒嬓閾<EFBFBD>问嚭驑毛禁蠝婐烀<EFBFBD>逐髱謭鳛湦髾三绫躇偮楙涃袝浤戅羸货印娜
-颧艖䴘摲剂ヨ駝溾锅杌恐壵灴勰療誊趷檿魤秹崛臀<EFBFBD>熿晃鳌瘕鲔屍蹤鄮疒嫆堄阪娋<EFBFBD>同佞瑸
-罄飓茵芍<EFBFBD><EFBFBD><EFBFBD>望鏂вわ嶟厕灈殉噶<EFBFBD>霝Ⅳ魃劭<EFBFBD>迶煍枍<EFBFBD>夈邮<EFBFBD>枳挑實淋忌椼撚訐顭振帼儎
-基劆萦佱岵粝搫<EFBFBD>蓴牺<EFBFBD>纮<EFBFBD>茎嗎畮<EFBFBD>麨<EFBFBD><EFBFBD><EFBFBD>庶撸冒棁<EFBFBD>繌氠構枀<EFBFBD>繉嗎ǖ髧讓樳
+(A3ABGgAAAOb/AAAAAHic7Z3NbhMxEID9frwDj8CV6155A7hz4IAQEkLcIKhFgAKoFSAiThQQtCJCkSpAVJWMqYlx/Tsee9eTdKxP0Wa7ntjenS+Ou02XR4slwzAMwzAMlp3Z3Qf3bt6+daMIVUVV7N54hmHooJygOPx6cHy8kuCiDlZVdN10/CvX7hCk+7AzTJbuaYJATTOUGeAmsYuqqKpnxwQXfLzCPmE2AoK5ky6qweqTS9HMxC6qoqrefUzm71fX73+EoI6U7BMaiHXp3pJg28qrDM6jHSf40yzdfYLILCWEmlek4BPdHQjqSMk+IYCdsNSU0kp0OkJNnO4+QWSW7ZNBCLNhtu39fiHik+eL7xDYJwTZGp84kxDjE39yApyiUPBJaWYZn2hppB/9gvCJOB/KnL6aXj97t4SA8ImIl5prtSiCX6WyGdPkFzD42O2f4ASl+4WOE8wdu8QSKptxwOxDZFbMJ4M1V/F7ZJ4W+cRvfGy7qKi+PH37DQJufpJIZ/QVW18LHifd8nScJnkBCU4EtE9iKyfLyBQFQva9OJiScJ9ksw+RWbZPjEZij3/HZRjsV6ycn7TyyZM3R5pLl6+abX9Pc580MQOuFjCO3ebs00T1xDE4SqOpK0/TsA3BQUYrJTbm6KGb0ietMis7P5FxmUgyPtl9fahQHdTop/6e7vOTmkt0VJ9kq9tVnJeGtMSxQWnO2hoZTymVPnFWTpzRbrJ+EvOJTFqixielmQX8/U5QJpKMT3b2v2hMN51tTb1PcFeaE6pJxY4+STwNB2lqg5F84pxZ9IlGjE+M9PqJkzgIn9gBW2UWxCcxmUgyPnm899lgOquxf9R3foKWSbAu3CfBNAFe5OJ8SeQLtCNYG5gZDk2fhO45cYdrvPUTe8N+6uyBBKnMrKxPhrMS+ykRn8xefbIxXXb2910/md4norAEIzjb/lCA2l9ng+AMB3EK0AMFjxMMWDRWhlKfSG8tJVgrG6QmsxyfOO1RJhHxyYkk45NHLw8cVJf9nR19Unnl+9WBAUX87RJyhQd9UhRh2eLzzn+HrI3kN6yGJj6xV07irzLW+onZhvskm32IzPLnJ3aT0jKRZO4/efjiA4SOn3eI+yQWCu6TRGN8G2BGwJjEi1Dpk6xMSoe68hhDq/tPnIrw7ENkVvDzjtaInpykc5nI/bGz+QJCl/vZ0BWbxBFe+jt106FEyCdFEf4dE7dBJejxhJxi+Gg7v9aJVT/bxK+fTFwQmRX0iTaJyE1OJBmf7M73IfD99ltGW5ngDnBakohT2mYKPinNrNh6rB7A7CtS8MnW/31xzfvmFtOk7w19sl4b0bO4wXssnqJ090nbvy/eFJ+Ulo3zCePTSqpgV0x0jA3B3EkX45PT0xMf1fHgfoOE+YQg3dOBYbJ0TxME+vuUTn7/QAD5PiWGYS4O+vsef/1cIYB83yPDMBeHsb+PmmGYCwX/vwyGYSjzB9cMmN8=)
 &]
 [s0;%% &]
 [s9;%% This class provides tool`-bars.&]
@@ -76,7 +61,8 @@ tyle][@(0.0.255) `&]_[* StyleDefault]()&]
 [s3;%% &]
 [s4; &]
 [s5;:ToolBar`:`:GetStdHeight`(`): [@(0.0.255) static] [@(0.0.255) int]_[* GetStdHeight]()&]
-[s2;%% Returns the standard height of a toolbar when used as a frame.&]
+[s2;%% Returns the standard height of a toolbar when used as a frame. 
+Not that this is only valid for toolbar with normal sized icons.&]
 [s3; &]
 [s0; &]
 [ {{10000@3 [s0;%% [*@(229)4 ToolBar`::Style]]}}&]
@@ -85,4 +71,4 @@ tyle][@(0.0.255) `&]_[* StyleDefault]()&]
 ][*@3;3 ChStyle][@(0.0.255)3 <][*3 Style][@(0.0.255)3 >][3 _]&]
 [s9;%% This structure defines the visual style of a ToolBar.&]
 [s3; &]
-[s0; ]
+[s0; ]]

uppsrc/ide/ide.upp

@@ -102,7 +102,8 @@ mainconfig
 	"" = "GUI GTK",
 	"" = "GUI MT X11",
 	"" = "GUI MT NOGTK",
-	"" = "GUI NOGTK";
+	"" = "GUI NOGTK",
+	"" = "GUI MT TEST_HIDPI";
 
 custom() "",
 	"",

uppsrc/ide/idebar.cpp

@@ -379,9 +379,9 @@ void Ide::Project(Bar& menu)
 	{
 		mainconfiglist.Enable(idestate == EDITING);
 		buildmode.Enable(idestate == EDITING);
-		menu.Add(mainconfiglist, 180);
+		menu.Add(mainconfiglist, HorzLayoutZoom(180));
 		menu.Gap(4);
-		menu.Add(buildmode, 180);
+		menu.Add(buildmode, HorzLayoutZoom(180));
 		menu.Separator();
 	}
 	if(!IsEditorMode()) {

uppsrc/ide/idewin.cpp

@@ -316,10 +316,11 @@ void Ide::SetupBars()
 	menubar.Transparent();
 	if(toolbar_in_row) {
 		toolbar.SetFrame(NullFrame());
+		int tcy = max(mainconfiglist.GetStdSize().cy + VertLayoutZoom(2), toolbar.GetStdHeight());
 		bararea.Add(menubar.LeftPos(0, l).VCenterPos(menubar.GetStdHeight()));
-		bararea.Add(toolbar.HSizePos(l, r).VCenterPos(toolbar.GetStdHeight()));
+		bararea.Add(toolbar.HSizePos(l, r).VCenterPos(tcy));
 		bararea.Add(display.RightPos(4, r).VSizePos(2, 3));
-		bararea.Height(max(menubar.GetStdHeight(), toolbar.GetStdHeight()));
+		bararea.Height(max(menubar.GetStdHeight(), tcy));
 		AddFrame(bararea);
 		toolbar.Transparent();
 	}
@@ -717,8 +718,13 @@ GUI_APP_MAIN
 void AppMain___()
 #endif
 {
+#ifdef flagTEST_HIDPI
+	Font fnt = GetStdFont();
+	SetStdFont(fnt.Height(2 * fnt.GetHeight()));
+#endif
 	SetLanguage(LNG_ENGLISH);
 	SetDefaultCharset(CHARSET_UTF8);
+	GUI_HiDPI_Write(1);
 
 	const Vector<String>& arg = CommandLine();