diff options
| author | Willem Jan Palenstijn | 2017-02-26 22:23:09 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2017-02-28 15:55:52 +0100 |
| commit | c64d91833f0b35ad415ef4a722038ce729bac85b (patch) | |
| tree | bf3afc53423f4fa6e998b1ad388732284f530743 /gui/ThemeEngine.cpp | |
| parent | 5510640dbcd1bda6ae41942ed56c9ac037fc5228 (diff) | |
| download | scummvm-rg350-c64d91833f0b35ad415ef4a722038ce729bac85b.tar.gz scummvm-rg350-c64d91833f0b35ad415ef4a722038ce729bac85b.tar.bz2 scummvm-rg350-c64d91833f0b35ad415ef4a722038ce729bac85b.zip | |
GUI: Check rect validity for popup/radio drawing
Diffstat (limited to 'gui/ThemeEngine.cpp')
| -rw-r--r-- | gui/ThemeEngine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 64b25d85f6..8e04b35f45 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -1308,7 +1308,7 @@ void ThemeEngine::drawRadiobuttonClip(const Common::Rect &r, const Common::Rect queueDDClip(dd, r2, clippingRect); r2.left = r2.right + checkBoxSize; - r2.right = r.right; + r2.right = MAX(r2.left, r.right); queueDDTextClip(getTextData(dd), getTextColor(dd), r2, clippingRect, str, true, false, _widgets[kDDRadiobuttonDefault]->_textAlignH, _widgets[dd]->_textAlignV); } @@ -1519,7 +1519,7 @@ void ThemeEngine::drawPopUpWidgetClip(const Common::Rect &r, const Common::Rect queueDDClip(dd, r, clip); - if (!sel.empty()) { + if (!sel.empty() && r.width() >= 13 && r.height() >= 1) { Common::Rect text(r.left + 3, r.top + 1, r.right - 10, r.bottom); queueDDTextClip(getTextData(dd), getTextColor(dd), text, clip, sel, true, false, _widgets[dd]->_textAlignH, _widgets[dd]->_textAlignV, deltax); } |