diff options
| author | Alexander Tkachev | 2019-07-31 15:19:36 +0700 |
|---|---|---|
| committer | Matan Bareket | 2019-08-03 04:35:48 -0400 |
| commit | c47b204ac35d0bdcccef65afcfe466959a458f21 (patch) | |
| tree | d4c65aeebd1d80e71d4c4a6704803d292a2ddf18 | |
| parent | 9ba3cd594d8e365cf53c1c375401de3cc0e826e0 (diff) | |
| download | scummvm-rg350-c47b204ac35d0bdcccef65afcfe466959a458f21.tar.gz scummvm-rg350-c47b204ac35d0bdcccef65afcfe466959a458f21.tar.bz2 scummvm-rg350-c47b204ac35d0bdcccef65afcfe466959a458f21.zip | |
GUI: Minor offsets fixes in Tooltip and EditTextWidget
| -rw-r--r-- | gui/Tooltip.cpp | 8 | ||||
| -rw-r--r-- | gui/widgets/edittext.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp index 50f10272fb..dfa1d54ec7 100644 --- a/gui/Tooltip.cpp +++ b/gui/Tooltip.cpp @@ -49,8 +49,8 @@ void Tooltip::setup(Dialog *parent, Widget *widget, int x, int y) { const Graphics::Font *tooltipFont = g_gui.theme()->getFont(ThemeEngine::kFontStyleTooltip); _wrappedLines.clear(); - _w = tooltipFont->wordWrapText(widget->getTooltip(), _maxWidth - 4, _wrappedLines); - _h = (tooltipFont->getFontHeight() + 2) * _wrappedLines.size(); + _w = tooltipFont->wordWrapText(widget->getTooltip(), _maxWidth - 4, _wrappedLines) + 4; + _h = (tooltipFont->getFontHeight() + 2) * _wrappedLines.size() + 4; _x = MIN<int16>(parent->_x + x + _xdelta, g_gui.getWidth() - _w - 3); _y = MIN<int16>(parent->_y + y + _ydelta, g_gui.getHeight() - _h - 3); @@ -62,9 +62,11 @@ void Tooltip::drawDialog(DrawLayer layerToDraw) { Dialog::drawDialog(layerToDraw); + int16 textX = _x + 3; // including 2px padding and 1px original code shift + int16 textY = _y + 3; for (Common::StringArray::const_iterator i = _wrappedLines.begin(); i != _wrappedLines.end(); ++i, ++num) { g_gui.theme()->drawText( - Common::Rect(_x + 1, _y + 1 + num * h, _x + 1 + _w, _y + 1 + (num + 1) * h), + Common::Rect(textX, textY + num * h, textX + _w, textY + (num + 1) * h), *i, ThemeEngine::kStateEnabled, Graphics::kTextAlignLeft, diff --git a/gui/widgets/edittext.cpp b/gui/widgets/edittext.cpp index b73cb99ced..e2dcd2be3e 100644 --- a/gui/widgets/edittext.cpp +++ b/gui/widgets/edittext.cpp @@ -100,7 +100,7 @@ void EditTextWidget::drawWidget() { setTextDrawableArea(r); g_gui.theme()->drawText( - Common::Rect(_x + 2 + _leftPadding, _y + 2, _x + _leftPadding + getEditRect().width() + 2, _y + _h), + Common::Rect(_x + 2 + _leftPadding, _y + 1, _x + _leftPadding + getEditRect().width() + 2, _y + _h), _editString, _state, Graphics::kTextAlignLeft, ThemeEngine::kTextInversionNone, -_editScrollOffset, false, _font, ThemeEngine::kFontColorNormal, true, _textDrawableArea); } |