From 0d9b7831d7716b844a202e146dbae579274dc474 Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sat, 28 Nov 2020 20:37:15 +0100 Subject: [PATCH] Revert "Fix bad use of constexpr." --- don't need that anymore with C++17 This reverts commit c55d8096d0081a963a5f431311b967361dcdf4d0. --- src/gui/ToolTip.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gui/ToolTip.cxx b/src/gui/ToolTip.cxx index 12ede067a..a887e0096 100644 --- a/src/gui/ToolTip.cxx +++ b/src/gui/ToolTip.cxx @@ -123,13 +123,12 @@ void ToolTip::release(bool emptyTip) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void ToolTip::show(const string& tip) { - uInt32 maxRows = MAX_ROWS; myTipPos = myMousePos; uInt32 maxWidth = std::min(myWidth - myTextXOfs * 2, uInt32(myFont->getStringWidth(tip))); 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, maxWidth, myHeight - myTextYOfs * 2, kTextColor)));