thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactored code in Dialog::findWidget to Widget::findWidgetInChain; changed NewGui::box() to take colors as param (instead of hard coding _color and _shadowColor)

Browse source 
svn-id: r11061
This commit is contained in:
Max Horn 2003-11-02 18:57:20 +00:00
parent 7ec257ae3f
commit ac4b9ccdb8
5 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gui/dialog.cpp
View file

@ -103,7 +103,7 @@ void Dialog::drawDialog() {
return;
g_gui.blendRect(_x, _y, _w, _h, g_gui._bgcolor);
g_gui.box(_x, _y, _w, _h);
g_gui.box(_x, _y, _w, _h, g_gui._color, g_gui._shadowcolor);
while (w) {
w->draw();
@ -267,16 +267,7 @@ void Dialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
* in the local coordinate system, i.e. relative to the top left of the dialog.
*/
Widget *Dialog::findWidget(int x, int y) {
Widget *w = _firstWidget;
while (w) {
// Stop as soon as we find a widget that contains the point (x,y)
if (x >= w->_x && x < w->_x + w->_w && y >= w->_y && y < w->_y + w->_h)
break;
w = w->_next;
}
if (w)
w = w->findWidget(x - w->_x, y - w->_y);
return w;
return Widget::findWidgetInChain(_firstWidget, x, y);
}
ButtonWidget *Dialog::addButton(int x, int y, const Common::String &label, uint32 cmd, char hotkey) {