From a4a63ffce1d88cde4431ee7a8e6b7ca42690ca85 Mon Sep 17 00:00:00 2001
From: Mirek Fidler <mirek.fidler@gmail.com>
Date: Wed, 21 Jan 2026 17:16:32 +0100
Subject: [PATCH] ide: QHD fixes

---
 uppsrc/CtrlLib/FileSel.cpp    | 2 +-
 uppsrc/ide/FindFile.cpp       | 2 +-
 uppsrc/ide/NewPackageFile.cpp | 2 +-
 uppsrc/ide/SelectPkg.cpp      | 4 ++--
 uppsrc/ide/ide.lay            | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp
index a8c77d452..16cec856f 100644
--- a/uppsrc/CtrlLib/FileSel.cpp
+++ b/uppsrc/CtrlLib/FileSel.cpp
@@ -1818,7 +1818,7 @@ bool FileSel::Execute(int _mode) {
 		sort_lbl.Hide();
 		ok.SetLabel(t_("&Select"));
 		Logc p = filename.GetPos().y;
-		int q = ok.GetPos().y.GetA() + ok.GetPos().y.GetB() + Zy(16);
+		int q = ok.GetPos().y.GetA() + ok.GetPos().y.GetB() + DPI(16);
 		p.SetA(q);
 		filename.SetPosY(p);
 		filesize.SetPosY(p);
diff --git a/uppsrc/ide/FindFile.cpp b/uppsrc/ide/FindFile.cpp
index 6cfa31cab..bbd8e1ffb 100644
--- a/uppsrc/ide/FindFile.cpp
+++ b/uppsrc/ide/FindFile.cpp
@@ -79,7 +79,7 @@ FindFileWindow::FindFileWindow(const Workspace& wspc, const String& actualPackag
 	list.AddColumn("File").SetDisplay(Single<FindFileFileDisplay>());
 	list.AddColumn("Package");
 	list.WhenLeftDouble = Acceptor(IDOK);
-	list.SetLineCy(max(Zy(16), Draw::GetStdFontCy()));
+	list.SetLineCy(max(DPI(16), Draw::GetStdFontCy()));
 	list.HorzGrid(false);
 	list.MultiSelect();
 	list.WantFocus(false);
diff --git a/uppsrc/ide/NewPackageFile.cpp b/uppsrc/ide/NewPackageFile.cpp
index 5b2e44fa0..1e88d69b0 100644
--- a/uppsrc/ide/NewPackageFile.cpp
+++ b/uppsrc/ide/NewPackageFile.cpp
@@ -14,7 +14,7 @@ NewPackageFileWindow::NewPackageFileWindow()
 {
 	CtrlLayoutOKCancel(*this, "New package file");
 
-	type.SetLineCy(max(Zy(16), Draw::GetStdFontCy()));
+	type.SetLineCy(max(DPI(16), Draw::GetStdFontCy()));
 	type.SetDropLines(20);
 	Type("cpp", "C++ source file");
 	Type("h", "C++ header file");
diff --git a/uppsrc/ide/SelectPkg.cpp b/uppsrc/ide/SelectPkg.cpp
index b9f1b5ab2..4b5a7a436 100644
--- a/uppsrc/ide/SelectPkg.cpp
+++ b/uppsrc/ide/SelectPkg.cpp
@@ -203,7 +203,7 @@ SelectPackageDlg::SelectPackageDlg(const char *title, bool selectvars_, bool mai
 	alist.AddColumn("Description");
 	alist.AddIndex();
 	alist.EvenRowColor();
-	alist.SetLineCy(max(Zy(16), Draw::GetStdFontCy()));
+	alist.SetLineCy(max(DPI(16), Draw::GetStdFontCy()));
 	alist.ColumnWidths("108 79 317");
 	list.Add(clist.SizePos());
 	list.Add(alist.SizePos());
@@ -735,7 +735,7 @@ struct PackageDisplay : Display {
 		ValueArray va = q;
 		Size sz = GetTextSize(String(va[0]), fnt);
 		sz.cx += Zx(20);
-		sz.cy = max(sz.cy, Zy(16));
+		sz.cy = max(sz.cy, DPI(16));
 		return sz;
 	}
 
diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay
index 4a3d5cb28..571665911 100644
--- a/uppsrc/ide/ide.lay
+++ b/uppsrc/ide/ide.lay
@@ -837,9 +837,9 @@ LAYOUT(RenamePackage2Layout, 228, 100)
 END_LAYOUT
 
 LAYOUT(NewPackageFileLayout, 280, 88)
-	ITEM(Upp::EditString, name, HSizePosZ(48, 8).TopPosZ(28, 19))
-	ITEM(Upp::Label, dv___1, SetLabel(t_("Name ")).LeftPosZ(4, 40).TopPosZ(28, 19))
-	ITEM(Upp::DropList, type, HSizePosZ(4, 8).TopPosZ(4, 19))
+	ITEM(Upp::EditString, name, HSizePosZ(48, 8).TopPosZ(32, 19))
+	ITEM(Upp::Label, dv___1, SetLabel(t_("Name ")).LeftPosZ(4, 40).TopPosZ(32, 19))
+	ITEM(Upp::DropList, type, HSizePosZ(4, 8).TopPosZ(4, 24))
 	ITEM(Upp::Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
 	ITEM(Upp::Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
 END_LAYOUT