diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-04 21:57:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-04 21:57:32 +0300 |
| commit | 8a5603e487f682f5f67bc2cedae81249aa138f5b (patch) | |
| tree | 697535ca4d8e50ee6da8cf364cad814fa5f7603a /src/gui/widgets/slider.cpp | |
| parent | 80f7177ea4ce0185e1ef3355e91dcf14617d0f09 (diff) | |
| parent | f2d1d2b43a0ebdb625aea94cb4b8ff7fce6bf8f4 (diff) | |
| download | plus-8a5603e487f682f5f67bc2cedae81249aa138f5b.tar.gz plus-8a5603e487f682f5f67bc2cedae81249aa138f5b.tar.bz2 plus-8a5603e487f682f5f67bc2cedae81249aa138f5b.tar.xz plus-8a5603e487f682f5f67bc2cedae81249aa138f5b.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/widgets/slider.cpp')
| -rw-r--r-- | src/gui/widgets/slider.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 039af9743..37b696a4e 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2013 The ManaPlus Developers + * Copyright (C) 2011-2014 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -156,7 +156,7 @@ void Slider::draw(gcn::Graphics *graphics) if (buttons[0].grid[HMID]) { const Image *const hMid = buttons[0].grid[HMID]; - g->calcImagePattern(mVertexes, hMid, x, y, + g->calcPattern(mVertexes, hMid, x, y, w, hMid->getHeight()); } @@ -184,7 +184,7 @@ void Slider::draw(gcn::Graphics *graphics) if (buttons[1].grid[HMID]) { const Image *const hMid = buttons[1].grid[HMID]; - g->calcImagePattern(mVertexes, hMid, x, y, + g->calcPattern(mVertexes, hMid, x, y, w, hMid->getHeight()); } @@ -209,7 +209,7 @@ void Slider::draw(gcn::Graphics *graphics) { if (!mHasMouse) { - DRAW_IMAGE(g, buttons[0].grid[HSTART], x, y); + g->drawImage2(buttons[0].grid[HSTART], x, y); const int width = buttons[0].grid[HSTART]->getWidth(); w -= width + buttons[0].grid[HEND]->getWidth(); x += width; @@ -217,22 +217,22 @@ void Slider::draw(gcn::Graphics *graphics) if (buttons[0].grid[HMID]) { const Image *const hMid = buttons[0].grid[HMID]; - g->drawImagePattern(hMid, x, y, w, hMid->getHeight()); + g->drawPattern(hMid, x, y, w, hMid->getHeight()); } x += w; - DRAW_IMAGE(g, buttons[0].grid[HEND], x, y); + g->drawImage2(buttons[0].grid[HEND], x, y); const Image *const img = buttons[0].grid[HGRIP]; if (img) { - DRAW_IMAGE(g, img, getMarkerPosition(), + g->drawImage2(img, getMarkerPosition(), (mDimension.height - img->getHeight()) / 2); } } else { - DRAW_IMAGE(g, buttons[1].grid[HSTART], x, y); + g->drawImage2(buttons[1].grid[HSTART], x, y); const int width = buttons[1].grid[HSTART]->getWidth(); w -= width; @@ -243,17 +243,17 @@ void Slider::draw(gcn::Graphics *graphics) if (buttons[1].grid[HMID]) { const Image *const hMid = buttons[1].grid[HMID]; - g->drawImagePattern(hMid, x, y, w, hMid->getHeight()); + g->drawPattern(hMid, x, y, w, hMid->getHeight()); } x += w; if (buttons[1].grid[HEND]) - DRAW_IMAGE(g, buttons[1].grid[HEND], x, y); + g->drawImage2(buttons[1].grid[HEND], x, y); const Image *const img = buttons[1].grid[HGRIP]; if (img) { - DRAW_IMAGE(g, img, getMarkerPosition(), + g->drawImage2(img, getMarkerPosition(), (mDimension.height - img->getHeight()) / 2); } } |