ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure long messages overlaid on framebuffer don't overflow display surface.

This commit is contained in:
Stephen Anthony 2020-06-19 19:55:27 -02:30
parent fcff01df3c
commit eafa29a520
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emucore/FrameBuffer.cxx
View File

@ -513,7 +513,8 @@ void FrameBuffer::showMessage(const string& message, MessagePosition position,
myMsg.text = message; myMsg.text = message;
myMsg.color = kBtnTextColor; myMsg.color = kBtnTextColor;
myMsg.showGauge = false; myMsg.showGauge = false;
myMsg.w = font().getStringWidth(myMsg.text) + HBORDER * 2; myMsg.w = std::min(fontWidth * (MESSAGE_WIDTH) - HBORDER * 2,
font().getStringWidth(myMsg.text) + HBORDER * 2);
myMsg.h = fontHeight + VBORDER * 2; myMsg.h = fontHeight + VBORDER * 2;
myMsg.position = position; myMsg.position = position;
myMsg.enabled = true; myMsg.enabled = true;
@ -565,7 +566,7 @@ void FrameBuffer::showMessage(const string& message, const string& valueText,
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool FrameBuffer::messageShown() bool FrameBuffer::messageShown() const
{ {
#ifdef GUI_SUPPORT #ifdef GUI_SUPPORT
return myMsg.enabled; return myMsg.enabled;

2
src/emucore/FrameBuffer.hxx
View File

@ -166,7 +166,7 @@ class FrameBuffer
void showMessage(const string& message, const string& valueText, void showMessage(const string& message, const string& valueText,
float value, float minValue = 0.F, float maxValue = 100.F); float value, float minValue = 0.F, float maxValue = 100.F);
bool messageShown(); bool messageShown() const;
/** /**
Toggles showing or hiding framerate statistics. Toggles showing or hiding framerate statistics.