aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordi Vilalta Prat2008-12-26 12:15:51 +0000
committerJordi Vilalta Prat2008-12-26 12:15:51 +0000
commitd18d2d72a8ce4688042fecb53481c8cc67d284f6 (patch)
tree535d33cd992cc4f51786cd891704da6ed65a5910
parent1e60714ff7b16b5a3018a3eae0a6bd89d2692dcf (diff)
downloadscummvm-rg350-d18d2d72a8ce4688042fecb53481c8cc67d284f6.tar.gz
scummvm-rg350-d18d2d72a8ce4688042fecb53481c8cc67d284f6.tar.bz2
scummvm-rg350-d18d2d72a8ce4688042fecb53481c8cc67d284f6.zip
Fix for the SliderWidget glitch when showing very small values (and potentially for other small widgets)
svn-id: r35557
-rw-r--r--graphics/VectorRendererSpec.cpp2
-rw-r--r--gui/ThemeEngine.cpp9
2 files changed, 3 insertions, 8 deletions
diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp
index f4e9d6b098..46c0ec6a67 100644
--- a/graphics/VectorRendererSpec.cpp
+++ b/graphics/VectorRendererSpec.cpp
@@ -426,6 +426,8 @@ template <typename PixelType, typename PixelFormat>
void VectorRendererSpec<PixelType, PixelFormat>::
colorFill(PixelType *first, PixelType *last, PixelType color) {
register int count = (last - first);
+ if (!count)
+ return;
register int n = (count + 7) >> 3;
switch (count % 8) {
case 0: do {
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index d483e06e82..671fe55f95 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -706,14 +706,7 @@ void ThemeEngine::drawSlider(const Common::Rect &r, int width, WidgetStateInfo s
drawWidgetBackground(r, 0, kWidgetBackgroundSlider, kStateEnabled);
- // TODO/FIXME: This seems to prevent displaying of
- // slider widgets in low ranges. When disabling it
- // the slider is shown, but it creates gfx glitches
- // in modern theme. Modern theme uses "roundedsq"
- // as drawing function, thus the real bug should be
- // in VectorRenderer::drawRoundedSquare.
- if (width > r.width() * 5 / 100)
- queueDD(dd, r2);
+ queueDD(dd, r2);
}
void ThemeEngine::drawScrollbar(const Common::Rect &r, int sliderY, int sliderHeight, ScrollbarState scrollState, WidgetStateInfo state) {