From a1e10ddefe228a1f84b287661ff950f4dadfa39b Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 11 Jul 2014 10:15:23 +0000
Subject: [PATCH] ide: Fixed layout issues for HDPI linux

git-svn-id: svn://ultimatepp.org/upp/trunk@7503 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/SrcUpdater/SrcUpdater.lay |   2 +-
 uppsrc/ide/SrcUpdater/Wizard.h       |   2 +-
 uppsrc/ide/icon.ico                  | Bin 2862 -> 2862 bytes
 uppsrc/ide/ide.lay                   |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/uppsrc/ide/SrcUpdater/SrcUpdater.lay b/uppsrc/ide/SrcUpdater/SrcUpdater.lay
index 1445ff73e..7e48f40df 100644
--- a/uppsrc/ide/SrcUpdater/SrcUpdater.lay
+++ b/uppsrc/ide/SrcUpdater/SrcUpdater.lay
@@ -4,7 +4,7 @@ END_LAYOUT
 
 LAYOUT(AssembliesLayout, 492, 280)
 	ITEM(RichTextCtrl, text, HSizePosZ(4, 4).TopPosZ(4, 104))
-	ITEM(ArrayCtrl, asmbls, HorzGrid(false).VertGrid(false).AutoHideSb(true).HSizePosZ(4, 4).VSizePosZ(112, 52))
+	ITEM(ArrayCtrl, asmbls, AutoHideSb(true).VertGrid(false).HorzGrid(false).HSizePosZ(4, 4).VSizePosZ(112, 52))
 	ITEM(Label, dv___2, SetLabel(t_("Sources Folder:")).LeftPosZ(16, 80).BottomPosZ(27, 17))
 	ITEM(Label, dv___3, SetLabel(t_("$(SRC) = ")).SetAlign(ALIGN_RIGHT).LeftPosZ(96, 48).BottomPosZ(27, 17))
 	ITEM(EditField, srcpath, HSizePosZ(144, 140).BottomPosZ(27, 17))
diff --git a/uppsrc/ide/SrcUpdater/Wizard.h b/uppsrc/ide/SrcUpdater/Wizard.h
index 20ee55803..95f8320fe 100644
--- a/uppsrc/ide/SrcUpdater/Wizard.h
+++ b/uppsrc/ide/SrcUpdater/Wizard.h
@@ -65,7 +65,7 @@ template <class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T
 
 template <class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9>\
 Wizard<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>::Wizard():step(0),count(0){
-	SetRect(0,0,600,400);
+	SetRect(0,0, HorzLayoutZoom(600),VertLayoutZoom(400));
 	*this << cancel.SetLabel(t_("Cancel")).RightPosZ(244, 72).BottomPosZ(4, 24)
 	      << prev.SetLabel(String("< ")+t_("Previous")).RightPosZ(164, 72).BottomPosZ(4, 24)
 	      << next.SetLabel(t_("Next")+String(" >")).RightPosZ(84, 72).BottomPosZ(4, 24)
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index ed674dab4681e8f6a8a54a9f03063eb6fa681734..da67a307592909d4bc06eee45ecb30e925c7a54f 100644
GIT binary patch
literal 2862
zcmeHJy-wUf5FY=<-c+Pa6_h6Qha$P7ATNM)PY@}}6F_@Xiljryad2+(EH2W}^EgP$
ze6ybQ-r88cfFea=(CqB|eBaK_f(21R866yu$k&|cBk#Ol5dG$u`bP=TtJg$Fs9`;1
zO=KlH;kth)md}cH>iD?Ua=^B2D>{Qq>Q<|jg`ysK<$xdNMjEjYMmPl)yN*N7=ZJDg
zcsWmMxL&Pi3u2n<EE^Gj&z<}B-3X`VU>OBfc@)o8at|)tse!NHIOq8tk{P6S65sJ@
zU(UJ-di+RD&;t7O6YF>)pYxB*A3WoDJRx{--x+uz>FV7afOUA}{A|L`-M;JD%?jtC
zw&&>M(#sGZM+SUx!E^Yy+5J1BHtTi8-;h|tJodl<yZfD~q@@$a$5N#^U4HvcmCfny
z&n;D{rIHCO$1TU)$Ya$1<?}cOkGxL|w{?Fkf3v!?ha6!~$~zWAZi+*(u>~gldEp4B
zF+Ed#2SunqcczM)W5ag|&)I*E-?4qg%#%9Hd|{R(rmi!?Mx-hVQ`WU9Iv>HZtX<NW
zjK!p7i49`TPj~$yO*JpLqDU2Qz@M`!zxa9JSCz@~+*Eyw%$0lm<mP$5v+f_ccH|MB
z`kifta=k!o{pR}f&$mspUEX}zux*-~bF7QSuZuNTu>Iid<~?lFY|gN5msd;Fv;8FY
R$NF?zBeOon8p%`V^Z<dB>(u}N

literal 2862
zcmcguy^hmB5FVe6&r5ZbRGhBi%1A*-bS~fpkW!{XLOcPqktm=;5ONncJc|n&dL9SK
z%r~>MyIv<z;G!F8c6NTgZ)eBRDntd9ba6o<?<%6_ybJyVq8}VH|GFTm9}-=ohV_!Q
zkd>(Ax_gv?&&u`C@p<jQfuZkv(IdE|ZnatsP}Bo&9PrcJjz$IuBUFLK&U48595L<;
zFXu@O*P9J&Nz8KIvJnaQ9Njl|Bb=6lWfat8FP^L99$Yx8fp6eE7x)#)3{ra#@A<4R
zwK~Co-%*pafIh>-JWu9xe$V{Dvm1|32wvRx2)vN^dYuEXibpQYChc7JzGs~k&O>eF
zh;iv<iq9hxzP#WRK5q8s2~l50UGW=|YnsO%7+}ZmOd~C|jL)SxtLV$ePt*(*{r>rj
znzMn<nPA}fz%d<pjxv9I%B6%`OWu#=yZ+M`oYZq*=!t(3tVeK3-HP}%V?{mi#sNRg
zv7ZZOYmgBhK`xe@ac5wkw>q@~@I5GgoKHByJ@fk-2k@3l=3x}0T#}c*!0~^0%p>-E
z==`)U?roltBjzN=Zjj0R{pirX?}J}6|7`;*Zcc*Nr%%t*IbyFqa>;Dt$+{cOibLU>
z7#^`i6}5MD$4On5p|C6pSJ$OuBhs|3Th_H}y^r8>S!>d{lEuxIOKcERe>V2p+062S
zYulOO9r!C&;}^e5{HAebRk<d%$Xr#xAKYN(r+a7hk6gcF+IM?riMpxW%n@5Zx_R^U
zao24Zw{JIWyYBWq*7^L~hc#EQeX4eI1>1F-*I2iU?+etkeI@qu`sMZoGV5npGr8-W
F{sOt@+Oq%v

diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay
index 537ba49c4..b1a9e669b 100644
--- a/uppsrc/ide/ide.lay
+++ b/uppsrc/ide/ide.lay
@@ -209,7 +209,7 @@ LAYOUT(BuildMethodsLayout, 788, 560)
 	ITEM(EditString, release_flags, RightPosZ(8, 504).TopPosZ(324, 19))
 	ITEM(Label, dv___35, SetLabel(t_("Release link options:")).RightPosZ(520, 108).TopPosZ(344, 19))
 	ITEM(EditString, release_link, RightPosZ(8, 504).TopPosZ(344, 19))
-	UNTYPED(linkmode_lock, LeftPosZ(4, 148).TopPosZ(384, 20))
+	UNTYPED(linkmode_lock, LeftPosZ(4, 148).BottomPosZ(156, 20))
 	ITEM(Label, dv___38, SetLabel(t_("Script file:")).LeftPosZ(4, 68).BottomPosZ(133, 19))
 	ITEM(EditField, scriptfile, LeftPosZ(4, 152).BottomPosZ(113, 19))
 	ITEM(Option, use_target, SetLabel(t_("Store all target files\nin the same directory")).LeftPosZ(4, 148).BottomPosZ(74, 28))