[Scummvm-cvs-logs] SF.net SVN: scummvm:[33174] scummvm/branches/gsoc2008-gui/gui
Tanoku at users.sourceforge.net
Tanoku at users.sourceforge.net
Mon Jul 21 18:14:07 CEST 2008
Revision: 33174
http://scummvm.svn.sourceforge.net/scummvm/?rev=33174&view=rev
Author: Tanoku
Date: 2008-07-21 16:14:06 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Cleanup.
Fix: Scroll widget background.
Modified Paths:
--------------
scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp
scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
scummvm/branches/gsoc2008-gui/gui/newgui.cpp
Modified: scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp 2008-07-21 15:55:25 UTC (rev 33173)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp 2008-07-21 16:14:06 UTC (rev 33174)
@@ -93,7 +93,7 @@
"<drawdata id = 'popup_hover' cache = false>"
- "<drawstep func = 'square' stroke = 0 fg_color = '0, 0, 0' fill = 'gradient' gradient_start = '214, 113, 8' gradient_end = '240, 200, 25' shadow = 3 />"
+ "<drawstep func = 'square' stroke = 0 fg_color = '0, 0, 0' fill = 'gradient' gradient_start = '214, 113, 8' gradient_end = '240, 200, 25' shadow = 0 />"
"<drawstep func = 'triangle' fg_color = '0, 0, 0' fill = 'foreground' width = '12' height = '12' xpos = '-16' ypos = 'center' orientation = 'bottom' />"
"<text vertical_align = 'center' horizontal_align = 'right' color = '255, 255, 255' />"
"</drawdata>"
@@ -109,7 +109,7 @@
"<drawdata id = 'button_hover' cache = false>"
"<text vertical_align = 'center' horizontal_align = 'center' color = '255, 255, 255' />"
- "<drawstep func = 'roundedsq' radius = '8' stroke = '1' fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' shadow = 3 />"
+ "<drawstep func = 'roundedsq' radius = '8' stroke = '1' fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' shadow = 0 />"
"</drawdata>"
"<drawdata id = 'button_disabled' cache = false>"
Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp 2008-07-21 15:55:25 UTC (rev 33173)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp 2008-07-21 16:14:06 UTC (rev 33174)
@@ -54,7 +54,7 @@
{kDDButtonHover, "button_hover", false, kDDButtonIdle},
{kDDButtonDisabled, "button_disabled", true, kDDNone},
- {kDDSliderFull, "slider_full", false, kDDWidgetBackgroundSlider},
+ {kDDSliderFull, "slider_full", false, kDDNone},
{kDDCheckboxEnabled, "checkbox_enabled", false, kDDCheckboxDisabled},
{kDDCheckboxDisabled, "checkbox_disabled", true, kDDNone},
@@ -306,18 +306,15 @@
q.dynData = dynamic;
if (_buffering) {
- warning("Queued up a '%s' for the %s", kDrawData[type].name, _widgets[type]->_buffer ? "buffer" : "screen");
-
- if (_widgets[type]->_buffer)
- _bufferQueue.push_back(q);
- else {
- if (kDrawData[type].parent != kDDNone)
+ if (_widgets[type]->_buffer) {
+ _bufferQueue.push_back(q);
+ } else {
+ if (kDrawData[type].parent != kDDNone && kDrawData[type].parent != type)
queueDD(kDrawData[type].parent, r);
_screenQueue.push_back(q);
}
} else {
- warning("Drawing a '%s' directly!", kDrawData[type].name);
drawDD(q, !_widgets[type]->_buffer, _widgets[type]->_buffer);
}
}
@@ -439,6 +436,7 @@
Common::Rect r2 = r;
r2.setWidth(MIN((int16)width, r.width()));
+ drawWidgetBackground(r, 0, kWidgetBackgroundSlider, kStateEnabled);
queueDD(kDDSliderFull, r2);
}
Modified: scummvm/branches/gsoc2008-gui/gui/newgui.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/newgui.cpp 2008-07-21 15:55:25 UTC (rev 33173)
+++ scummvm/branches/gsoc2008-gui/gui/newgui.cpp 2008-07-21 16:14:06 UTC (rev 33174)
@@ -194,7 +194,6 @@
case kRedrawCloseDialog:
case kRedrawFull:
case kRedrawTopDialog:
- warning("Full screen redraw. Oops");
_theme->clearAll();
_theme->closeAllDialogs();
@@ -207,8 +206,6 @@
//_theme->startBuffering();
_dialogStack.top()->drawDialog();
_theme->finishBuffering();
-
- warning("Dialog opened");
break;
default:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list