mirror of https://github.com/stella-emu/stella.git
Revert "Fix bad use of constexpr." --- don't need that anymore with C++17
This reverts commit c55d8096d0
.
This commit is contained in:
parent
2d9c9a5003
commit
0d9b7831d7
|
@ -123,13 +123,12 @@ void ToolTip::release(bool emptyTip)
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
void ToolTip::show(const string& tip)
|
void ToolTip::show(const string& tip)
|
||||||
{
|
{
|
||||||
uInt32 maxRows = MAX_ROWS;
|
|
||||||
myTipPos = myMousePos;
|
myTipPos = myMousePos;
|
||||||
|
|
||||||
uInt32 maxWidth = std::min(myWidth - myTextXOfs * 2, uInt32(myFont->getStringWidth(tip)));
|
uInt32 maxWidth = std::min(myWidth - myTextXOfs * 2, uInt32(myFont->getStringWidth(tip)));
|
||||||
|
|
||||||
mySurface->fillRect(1, 1, maxWidth + myTextXOfs * 2 - 2, myHeight - 2, kWidColor);
|
mySurface->fillRect(1, 1, maxWidth + myTextXOfs * 2 - 2, myHeight - 2, kWidColor);
|
||||||
int lines = std::min(maxRows,
|
int lines = std::min(MAX_ROWS,
|
||||||
uInt32(mySurface->drawString(*myFont, tip, myTextXOfs, myTextYOfs,
|
uInt32(mySurface->drawString(*myFont, tip, myTextXOfs, myTextYOfs,
|
||||||
maxWidth, myHeight - myTextYOfs * 2,
|
maxWidth, myHeight - myTextYOfs * 2,
|
||||||
kTextColor)));
|
kTextColor)));
|
||||||
|
|
Loading…
Reference in New Issue