zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-24 21:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed positoning issues in the load/save menu.

Browse source
This commit is contained in:
Christoph Oelckers 2019-03-15 20:22:40 +01:00
parent 2573ca8ac4
commit 04281d4a0b
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wadsrc/static/zscript/ui/menu/loadsavemenu.zs
View file

@ -146,7 +146,6 @@ class LoadSaveMenu : ListMenu
commentRight = commentLeft + commentWidth; commentRight = commentLeft + commentWidth;
commentBottom = commentTop + commentHeight; commentBottom = commentTop + commentHeight;
commentRows = commentHeight / rowHeight; commentRows = commentHeight / rowHeight;
} }
@ -206,7 +205,7 @@ class LoadSaveMenu : ListMenu
for(int i = 0; i < numlinestoprint; i++) for(int i = 0; i < numlinestoprint; i++)
{ {
screen.DrawText(NewConsoleFont, Font.CR_ORANGE, commentLeft / FontScale, (commentTop + rowHeight * i) / FontScale, BrokenSaveComment.StringAt(i), screen.DrawText(NewConsoleFont, Font.CR_ORANGE, commentLeft / FontScale, (commentTop + rowHeight * i) / FontScale, BrokenSaveComment.StringAt(i),
DTA_VirtualWidthF, screen.GetWidth() / FontScale, DTA_VirtualHeightF, screen.GetHeight() / FontScale); DTA_VirtualWidthF, screen.GetWidth() / FontScale, DTA_VirtualHeightF, screen.GetHeight() / FontScale, DTA_KeepRatio, true);
} }
@ -220,7 +219,7 @@ class LoadSaveMenu : ListMenu
int textlen = SmallFont.StringWidth(text) * CleanXfac; int textlen = SmallFont.StringWidth(text) * CleanXfac;
screen.DrawText (NewConsoleFont, Font.CR_GOLD, (listboxLeft+(listboxWidth-textlen)/2) / FontScale, (listboxTop+(listboxHeight-rowHeight)/2) / FontScale, text, screen.DrawText (NewConsoleFont, Font.CR_GOLD, (listboxLeft+(listboxWidth-textlen)/2) / FontScale, (listboxTop+(listboxHeight-rowHeight)/2) / FontScale, text,
DTA_VirtualWidthF, screen.GetWidth() / FontScale, DTA_VirtualHeightF, screen.GetHeight() / FontScale); DTA_VirtualWidthF, screen.GetWidth() / FontScale, DTA_VirtualHeightF, screen.GetHeight() / FontScale, DTA_KeepRatio, true);
return; return;
} }
@ -255,7 +254,7 @@ class LoadSaveMenu : ListMenu
if (!mEntering) if (!mEntering)
{ {
screen.DrawText (NewConsoleFont, colr, (listboxLeft+1) / FontScale, (listboxTop+rowHeight*i + FontScale) / FontScale, node.SaveTitle, screen.DrawText (NewConsoleFont, colr, (listboxLeft+1) / FontScale, (listboxTop+rowHeight*i + FontScale) / FontScale, node.SaveTitle,
DTA_VirtualWidthF, screen.GetWidth() / FontScale, DTA_VirtualHeightF, screen.GetHeight() / FontScale); DTA_VirtualWidthF, screen.GetWidth() / FontScale, DTA_VirtualHeightF, screen.GetHeight() / FontScale, DTA_KeepRatio, true);
} }
else else
{ {
@ -263,13 +262,13 @@ class LoadSaveMenu : ListMenu
int length = NewConsoleFont.StringWidth(s) * FontScale; int length = NewConsoleFont.StringWidth(s) * FontScale;
int displacement = min(0, listboxWidth - 2 - length); int displacement = min(0, listboxWidth - 2 - length);
screen.DrawText (NewConsoleFont, Font.CR_WHITE, (listboxLeft + 1 + displacement) / FontScale, (listboxTop+rowHeight*i + FontScale) / FontScale, s, screen.DrawText (NewConsoleFont, Font.CR_WHITE, (listboxLeft + 1 + displacement) / FontScale, (listboxTop+rowHeight*i + FontScale) / FontScale, s,
DTA_VirtualWidthF, screen.GetWidth() / FontScale, DTA_VirtualHeightF, screen.GetHeight() / FontScale); DTA_VirtualWidthF, screen.GetWidth() / FontScale, DTA_VirtualHeightF, screen.GetHeight() / FontScale, DTA_KeepRatio, true);
} }
} }
else else
{ {
screen.DrawText (NewConsoleFont, colr, (listboxLeft+1) / FontScale, (listboxTop+rowHeight*i + FontScale) / FontScale, node.SaveTitle, screen.DrawText (NewConsoleFont, colr, (listboxLeft+1) / FontScale, (listboxTop+rowHeight*i + FontScale) / FontScale, node.SaveTitle,
DTA_VirtualWidthF, screen.GetWidth() / FontScale, DTA_VirtualHeightF, screen.GetHeight() / FontScale); DTA_VirtualWidthF, screen.GetWidth() / FontScale, DTA_VirtualHeightF, screen.GetHeight() / FontScale, DTA_KeepRatio, true);
} }
screen.ClearClipRect(); screen.ClearClipRect();
j++; j++;
@ -475,6 +474,7 @@ class SaveMenu : LoadSaveMenu
manager.InsertNewSaveNode(); manager.InsertNewSaveNode();
TopItem = 0; TopItem = 0;
Selected = manager.ExtractSaveData (-1); Selected = manager.ExtractSaveData (-1);
UpdateSaveComment();
} }
//============================================================================= //=============================================================================
@ -614,7 +614,7 @@ class LoadMenu : LoadSaveMenu
Super.Init(parent, desc); Super.Init(parent, desc);
TopItem = 0; TopItem = 0;
Selected = manager.ExtractSaveData (-1); Selected = manager.ExtractSaveData (-1);
UpdateSaveComment();
} }
//============================================================================= //=============================================================================