diff options
| author | Vicent Marti | 2008-08-10 18:35:27 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-08-10 18:35:27 +0000 |
| commit | b2bac41d0ed98f4f69a9a9232d7a373d76ef1e39 (patch) | |
| tree | 008dc6f3729baca14c5f325e4e40a80c081d4b7d | |
| parent | 559c19e9f4aa22ab37cbc4af29ea1dae28dd42a4 (diff) | |
| download | scummvm-rg350-b2bac41d0ed98f4f69a9a9232d7a373d76ef1e39.tar.gz scummvm-rg350-b2bac41d0ed98f4f69a9a9232d7a373d76ef1e39.tar.bz2 scummvm-rg350-b2bac41d0ed98f4f69a9a9232d7a373d76ef1e39.zip | |
Reverted debug layout drawing.
Bugfix: Scrollbar overlapping in text widgets/text overlapping?
svn-id: r33765
| -rw-r--r-- | gui/ListWidget.cpp | 4 | ||||
| -rw-r--r-- | gui/ThemeRenderer.cpp | 8 | ||||
| -rw-r--r-- | gui/themes/scummodern.stx | 2 | ||||
| -rw-r--r-- | gui/themes/scummodern.zip | bin | 109834 -> 112527 bytes |
4 files changed, 7 insertions, 7 deletions
diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp index d6649fc7f2..fa79ef4670 100644 --- a/gui/ListWidget.cpp +++ b/gui/ListWidget.cpp @@ -398,7 +398,7 @@ void ListWidget::drawWidget() { if (_selectedItem == pos && _editMode) { buffer = _editString; adjustOffset(); - width = _w - r.left - _hlRightPadding - _leftPadding; + width = _w - r.left - _hlRightPadding - _leftPadding - _scrollBarWidth; g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + width, y + fontHeight-2), buffer, _state, Theme::kTextAlignLeft, inverted, pad); } else { @@ -409,7 +409,7 @@ void ListWidget::drawWidget() { if (width > _w - r.left) width = _w - r.left; } else - width = _w - r.left - _hlRightPadding; + width = _w - r.left - _hlRightPadding - _scrollBarWidth; if (width > maxWidth) maxWidth = width; g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + maxWidth, y + fontHeight-2), diff --git a/gui/ThemeRenderer.cpp b/gui/ThemeRenderer.cpp index 1c3a1af8cf..b8d7204669 100644 --- a/gui/ThemeRenderer.cpp +++ b/gui/ThemeRenderer.cpp @@ -866,11 +866,11 @@ void ThemeRenderer::updateScreen() { _textQueue.clear(); } -// renderDirtyScreen(); + renderDirtyScreen(); - _vectorRenderer->fillSurface(); - themeEval()->debugDraw(_screen, _font); - _vectorRenderer->copyWholeFrame(_system); +// _vectorRenderer->fillSurface(); +// themeEval()->debugDraw(_screen, _font); +// _vectorRenderer->copyWholeFrame(_system); } void ThemeRenderer::renderDirtyScreen() { diff --git a/gui/themes/scummodern.stx b/gui/themes/scummodern.stx index d3df1865ca..fb388b7e5f 100644 --- a/gui/themes/scummodern.stx +++ b/gui/themes/scummodern.stx @@ -478,7 +478,7 @@ <def resolution = '320xY' var = 'About.OuterBorder' value = '16'/> <def var = 'ListWidget.hlLeftPadding' value = '0'/> - <def var = 'ListWidget.hlRightPadding' value = '16'/> + <def var = 'ListWidget.hlRightPadding' value = '0'/> <def var = 'PopUpWidget.labelSpacing' value = '10' /> <def var = 'ShowLauncherLogo' value = '1'/> diff --git a/gui/themes/scummodern.zip b/gui/themes/scummodern.zip Binary files differindex e9280529f1..dd53887cda 100644 --- a/gui/themes/scummodern.zip +++ b/gui/themes/scummodern.zip |