Browse Source

Make ScrollBarArrowFrame C++03 compatible

pull/740/head
Anders Jenbo 6 years ago
parent
commit
5a7d86b46e
  1. 4
      SourceX/DiabloUI/diabloui.cpp
  2. 10
      SourceX/DiabloUI/scrollbar.h

4
SourceX/DiabloUI/diabloui.cpp

@ -693,12 +693,12 @@ void Render(const UiScrollBar &ui_sb)
// Arrows:
{
const SDL_Rect rect = UpArrowRect(ui_sb);
const int frame = static_cast<int>(scrollBarState.upArrowPressed ? ScrollBarArrowFrame::UP_ACTIVE : ScrollBarArrowFrame::UP);
const int frame = static_cast<int>(scrollBarState.upArrowPressed ? ScrollBarArrowFrame_UP_ACTIVE : ScrollBarArrowFrame_UP);
DrawArt(rect.x, rect.y, ui_sb.arrow, frame, rect.w);
}
{
const SDL_Rect rect = DownArrowRect(ui_sb);
const int frame = static_cast<int>(scrollBarState.downArrowPressed ? ScrollBarArrowFrame::DOWN_ACTIVE : ScrollBarArrowFrame::DOWN);
const int frame = static_cast<int>(scrollBarState.downArrowPressed ? ScrollBarArrowFrame_DOWN_ACTIVE : ScrollBarArrowFrame_DOWN);
DrawArt(rect.x, rect.y, ui_sb.arrow, frame, rect.w);
}

10
SourceX/DiabloUI/scrollbar.h

@ -9,11 +9,11 @@ extern Art ArtScrollBarBackground;
const Uint16 SCROLLBAR_BG_WIDTH = 25;
extern Art ArtScrollBarArrow;
enum class ScrollBarArrowFrame {
UP_ACTIVE = 0,
UP,
DOWN_ACTIVE,
DOWN,
enum ScrollBarArrowFrame {
ScrollBarArrowFrame_UP_ACTIVE = 0,
ScrollBarArrowFrame_UP,
ScrollBarArrowFrame_DOWN_ACTIVE,
ScrollBarArrowFrame_DOWN,
};
extern Art ArtScrollBarThumb;

Loading…
Cancel
Save