diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /gui/Tooltip.cpp | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'gui/Tooltip.cpp')
| -rw-r--r-- | gui/Tooltip.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp index 64c34688df..272fa66072 100644 --- a/gui/Tooltip.cpp +++ b/gui/Tooltip.cpp @@ -34,7 +34,7 @@ namespace GUI { -Tooltip::Tooltip() : +Tooltip::Tooltip() : Dialog(-1, -1, -1, -1), _maxWidth(-1) { _backgroundType = GUI::ThemeEngine::kDialogBackgroundTooltip; @@ -69,7 +69,7 @@ bool Tooltip::tooltipModal(int x, int y) { _h = (tooltipFont->getFontHeight() + 2) * _wrappedLines.size(); _x = MIN<int16>(g_gui.getTopDialog()->_x + x + _xdelta, g_gui.getWidth() - _w - 3); - _y = MIN<int16>(g_gui.getTopDialog()->_y + y + _ydelta, g_gui.getHeight() - _h - 3); + _y = MIN<int16>(g_gui.getTopDialog()->_y + y + _ydelta, g_gui.getHeight() - _h - 3); open(); g_gui.runLoop(); @@ -85,14 +85,14 @@ void Tooltip::drawDialog() { 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), *i, - ThemeEngine::kStateEnabled, - Graphics::kTextAlignLeft, - ThemeEngine::kTextInversionNone, + Common::Rect(_x + 1, _y + 1 + num * h, _x + 1 +_w, _y + 1+ (num + 1) * h), *i, + ThemeEngine::kStateEnabled, + Graphics::kTextAlignLeft, + ThemeEngine::kTextInversionNone, 0, - false, - ThemeEngine::kFontStyleTooltip, - ThemeEngine::kFontColorNormal, + false, + ThemeEngine::kFontStyleTooltip, + ThemeEngine::kFontColorNormal, false ); } |