github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-16 14:16:09 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Merge branch 'stable' of https://github.com/ultimatepp/ultimatepp into stable

Browse source
This commit is contained in:
Mirek Fidler 2024-12-21 10:48:51 +01:00
commit 505c801be3
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppbox/MakeInstall7/Main.cpp
View file

@ -86,7 +86,7 @@ int FilterVersion(int c) { return c == ':' ? '_' : c; }
void Make(String pkg, String exe)
{
Syx("wine " + home + "/upp.win32/umk.exe u:/upp.src/uppsrc " + pkg + " u:/upp.src/uppbox/MakeInstall7/CLANGx64.bm" + " -arv "
Syx("wine " + home + "/upp.win32/umk.exe u:/upp.tmp/upp/uppsrc " + pkg + " u:/upp.src/uppbox/MakeInstall7/CLANGx64.bm" + " -arv "
+ "u:/upp.tmp/upp/" + exe);
FileDelete(upptmp + "/" + ForceExt(exe, ".map"));
}

2
uppsrc/ide/About.cpp
View file

@ -110,7 +110,7 @@ Size SplashCtrl::MakeLogo(Ctrl& parent, Array<Ctrl>& ctrl)
if(IsUHDMode())
h << "UHD mode\n";
v1 = h;
v1.HSizePos(DPI(220), DPI(10)).BottomPos(DPI(20), Arial(DPI(20)).GetHeight() * 5);
v1.HSizePos(DPI(220), DPI(10)).BottomPos(DPI(20), Arial(DPI(20)).GetHeight() * 6);
v1.SetFont(Arial(DPI(10)));
v1.SetInk(SColorText());
l.Add(v1);