diff options
| -rw-r--r-- | gui/ScrollBarWidget.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gui/ScrollBarWidget.cpp b/gui/ScrollBarWidget.cpp index 0b1945272c..16ef59f115 100644 --- a/gui/ScrollBarWidget.cpp +++ b/gui/ScrollBarWidget.cpp @@ -164,7 +164,7 @@ void ScrollBarWidget::handleMouseMoved(int x, int y, int button) { 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 @@ void ScrollBarWidget::drawWidget(bool hilite) { // 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); } } |