zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- script side support for menu transitions.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-08 17:44:23 +02:00
parent cf7518fe43
commit fa4ab53e7c
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/menu/menu.cpp
View file

@ -458,7 +458,6 @@ void M_DoStartControlPanel (bool scaleoverride)
delete CurrentScaleOverrider;
CurrentScaleOverrider = nullptr;
}
}
//=============================================================================

2
wadsrc/static/zscript/ui/menu/listmenu.zs
View file

@ -21,6 +21,7 @@ class ListMenuDescriptor : MenuDescriptor native
native int mFontColor;
native int mFontColor2;
native bool mCenter;
native bool mAnimatedTransition;
native int mVirtWidth, mVirtHeight;
native void Reset();
@ -51,6 +52,7 @@ class ListMenu : Menu
{
Super.Init(parent);
mDesc = desc;
AnimatedTransition = mDesc.mAnimatedTransition;
if (desc.mCenter)
{
double center = 160;

6
wadsrc/static/zscript/ui/menu/menu.zs
View file

@ -94,6 +94,7 @@ class Menu : Object native ui version("2.4")
native bool mBackbuttonSelected;
native bool DontDim;
native bool DontBlur;
native bool AnimatedTransition;
native static int MenuTime();
native static Menu GetCurrentMenu();
@ -116,6 +117,7 @@ class Menu : Object native ui version("2.4")
mBackbuttonSelected = false;
DontDim = false;
DontBlur = false;
AnimatedTransition = false;
}
//=============================================================================
@ -241,11 +243,11 @@ class Menu : Object native ui version("2.4")
int y = (!(m_show_backbutton&2))? 0:screen.GetHeight() - h;
if (mBackbuttonSelected && (mMouseCapture || m_use_mouse == 1))
{
screen.DrawTexture(tex, true, x, y, DTA_CleanNoMove, true, DTA_ColorOverlay, Color(40, 255,255,255));
screen.DrawTexture(tex, true, x, y, DTA_CleanNoMove, true, DTA_ColorOverlay, Color(40, 255,255,255), DTA_NOOFFSET, true);
}
else
{
screen.DrawTexture(tex, true, x, y, DTA_CleanNoMove, true, DTA_Alpha, BackbuttonAlpha);
screen.DrawTexture(tex, true, x, y, DTA_CleanNoMove, true, DTA_Alpha, BackbuttonAlpha, DTA_NOOFFSET, true);
}
}
}

2
wadsrc/static/zscript/ui/menu/menucustomize.zs
View file

@ -1,6 +1,6 @@
// This class allows global customization of certain menu aspects, e.g. replacing the menu caption.
class MenuDelegateBase
class MenuDelegateBase ui
{
virtual int DrawCaption(String title, Font fnt, int y, bool drawit)
{