[Scummvm-cvs-logs] CVS: scummvm/gui ScrollBarWidget.cpp,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Sun Nov 2 17:33:09 CET 2003


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv16616

Modified Files:
	ScrollBarWidget.cpp 
Log Message:
alternate scroll bar look

Index: ScrollBarWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ScrollBarWidget.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ScrollBarWidget.cpp	2 Nov 2003 14:50:44 -0000	1.11
+++ ScrollBarWidget.cpp	3 Nov 2003 01:32:26 -0000	1.12
@@ -164,7 +164,7 @@
 
 void ScrollBarWidget::handleTickle() {
 /*
-	// FIXME - this code is supposed to allow for "click-repeat" (like key repeat),
+	// FIXME/TODO - this code is supposed to allow for "click-repeat" (like key repeat),
 	// i.e. if you click on one of the arrows and keep clicked, it will scroll
 	// continously. However, just like key repeat, this requires two delays:
 	// First an "initial" delay that has to pass before repeating starts (otherwise
@@ -224,19 +224,24 @@
 	// Up arrow
 	gui->frameRect(_x, _y, _w, UP_DOWN_BOX_HEIGHT, gui->_color);
 	gui->drawBitmap(up_arrow, _x, _y,
-									isSinglePage ? gui->_color :
-									(hilite && _part == kUpArrowPart) ? gui->_textcolorhi : gui->_textcolor);
+	                isSinglePage ? gui->_color :
+	                (hilite && _part == kUpArrowPart) ? gui->_textcolorhi : gui->_textcolor);
 
 	// Down arrow
 	gui->frameRect(_x, bottomY - UP_DOWN_BOX_HEIGHT, _w, UP_DOWN_BOX_HEIGHT, gui->_color);
 	gui->drawBitmap(down_arrow, _x, bottomY - UP_DOWN_BOX_HEIGHT,
-									isSinglePage ? gui->_color :
-									(hilite && _part == kDownArrowPart) ? gui->_textcolorhi : gui->_textcolor);
+	                isSinglePage ? gui->_color :
+	                (hilite && _part == kDownArrowPart) ? gui->_textcolorhi : gui->_textcolor);
 
 	// Slider
 	if (!isSinglePage) {
-		gui->checkerRect(_x, _y + _sliderPos, _w, _sliderHeight,
-										(hilite && _part == kSliderPart) ? gui->_textcolorhi : gui->_textcolor);
+		gui->fillRect(_x, _y + _sliderPos, _w, _sliderHeight,
+		              (hilite && _part == kSliderPart) ? gui->_textcolorhi : gui->_textcolor);
 		gui->frameRect(_x, _y + _sliderPos, _w, _sliderHeight, gui->_color);
+		int y = _y + _sliderPos + _sliderHeight/2;
+		NewGuiColor color = (hilite && _part == kSliderPart) ? gui->_color : gui->_shadowcolor;
+		gui->hLine(_x+2, y-2, _x+_w-3, color);
+		gui->hLine(_x+2, y, _x+_w-3, color);
+		gui->hLine(_x+2, y+2, _x+_w-3, color);
 	}
 }





More information about the Scummvm-git-logs mailing list