diff options
| author | Vicent Marti | 2008-07-13 11:07:56 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-07-13 11:07:56 +0000 |
| commit | 9a4992cc37252eb7162aafa72c868558d1b328f1 (patch) | |
| tree | 09b2ae8e5946b69c7def19da58a46cb41c728b14 | |
| parent | 4cb2b8c3c43d26569960e271ac35e0dd9f4de5b4 (diff) | |
| download | scummvm-rg350-9a4992cc37252eb7162aafa72c868558d1b328f1.tar.gz scummvm-rg350-9a4992cc37252eb7162aafa72c868558d1b328f1.tar.bz2 scummvm-rg350-9a4992cc37252eb7162aafa72c868558d1b328f1.zip | |
More widgets.
svn-id: r33029
| -rw-r--r-- | gui/ThemeDefaultXML.cpp | 4 | ||||
| -rw-r--r-- | gui/ThemeRenderer.cpp | 29 | ||||
| -rw-r--r-- | gui/ThemeRenderer.h | 9 |
3 files changed, 33 insertions, 9 deletions
diff --git a/gui/ThemeDefaultXML.cpp b/gui/ThemeDefaultXML.cpp index 3cd2d735d2..932c239f37 100644 --- a/gui/ThemeDefaultXML.cpp +++ b/gui/ThemeDefaultXML.cpp @@ -79,6 +79,10 @@ bool ThemeRenderer::loadDefaultXML() { "<drawstep func = 'square' fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' shadow = 0 />" "<drawstep func = 'circle' radius = 'auto' fill = 'foreground' />" "</drawdata>" + + "<drawdata id = 'widget_default' cache = false>" + "<drawstep func = 'roundedsq' gradient_factor = 6 radius = '4' fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' shadow = 0 />" + "</drawdata>" "</render_info>" "<layout_info>" diff --git a/gui/ThemeRenderer.cpp b/gui/ThemeRenderer.cpp index ce9e94faa2..5f4c43dc79 100644 --- a/gui/ThemeRenderer.cpp +++ b/gui/ThemeRenderer.cpp @@ -44,13 +44,16 @@ const char *ThemeRenderer::kDrawDataStrings[] = { "special_bg", "plain_bg", "default_bg", + + "widget_default", + "widget_small", + "widget_textedit", + "widget_slider", "button_idle", "button_hover", "button_disabled", - "surface", - "slider_full", "slider_empty", @@ -60,8 +63,6 @@ const char *ThemeRenderer::kDrawDataStrings[] = { "tab", "scrollbar_base", - "scrollbar_top", - "scrollbar_bottom", "scrollbar_handle", "popup", @@ -404,7 +405,25 @@ void ThemeRenderer::drawSurface(const Common::Rect &r, const Graphics::Surface & void ThemeRenderer::drawWidgetBackground(const Common::Rect &r, uint16 hints, WidgetBackground background, WidgetStateInfo state) { if (!ready()) return; - + + switch (background) { + case kWidgetBackgroundBorderSmall: + drawDD(kDDWidgetBackgroundSmall, r); + break; + + case kWidgetBackgroundEditText: + drawDD(kDDWidgetBackgroundEditText, r); + break; + + case kWidgetBackgroundSlider: + drawDD(kDDWidgetBackgroundSlider, r); + break; + + default: + drawDD(kDDWidgetBackgroundDefault, r); + break; + } + debugWidgetPosition("Widget Background", r); } diff --git a/gui/ThemeRenderer.h b/gui/ThemeRenderer.h index 6e9866d653..aa4008c0e8 100644 --- a/gui/ThemeRenderer.h +++ b/gui/ThemeRenderer.h @@ -86,13 +86,16 @@ public: kDDSpecialColorBackground, kDDPlainColorBackground, kDDDefaultBackground, + + kDDWidgetBackgroundDefault, + kDDWidgetBackgroundSmall, + kDDWidgetBackgroundEditText, + kDDWidgetBackgroundSlider, kDDButtonIdle, kDDButtonHover, kDDButtonDisabled, - kDDSurface, - kDDSliderFull, kDDSliderEmpty, @@ -102,8 +105,6 @@ public: kDDTab, kDDScrollbarBase, - kDDScrollbarButtonTop, - kDDScrollbarButtonBottom, kDDScrollbarHandle, kDDPopUp, |