summaryrefslogtreecommitdiff
path: root/src/gui/widgets/slider.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-15 00:23:39 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-15 00:23:39 +0300
commit53d28e67f8b7966596818af7cbfd360df241b332 (patch)
tree2924b2c260c14bfb8344d75c4bf7482d5263a39a /src/gui/widgets/slider.cpp
parent36de2c64d6bba077775360c9c0d681f0a096ffc3 (diff)
downloadmanaplus-53d28e67f8b7966596818af7cbfd360df241b332.tar.gz
manaplus-53d28e67f8b7966596818af7cbfd360df241b332.tar.bz2
manaplus-53d28e67f8b7966596818af7cbfd360df241b332.tar.xz
manaplus-53d28e67f8b7966596818af7cbfd360df241b332.zip
rename calcTile methods into separate names calcTileVertexes, calTileCollection.
Diffstat (limited to 'src/gui/widgets/slider.cpp')
-rw-r--r--src/gui/widgets/slider.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 47d4e2215..313a08162 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -146,7 +146,8 @@ void Slider::draw(gcn::Graphics *graphics)
mVertexes->clear();
if (!mHasMouse)
{
- g->calcTile(mVertexes, buttons[0].grid[HSTART], x, y);
+ g->calcTileCollection(mVertexes,
+ buttons[0].grid[HSTART], x, y);
const int width = buttons[0].grid[HSTART]->getWidth();
w -= width + buttons[0].grid[HEND]->getWidth();
@@ -160,18 +161,19 @@ void Slider::draw(gcn::Graphics *graphics)
}
x += w;
- g->calcTile(mVertexes, buttons[0].grid[HEND], x, y);
+ g->calcTileCollection(mVertexes, buttons[0].grid[HEND], x, y);
const Image *const img = buttons[0].grid[HGRIP];
if (img)
{
- g->calcTile(mVertexes, img, getMarkerPosition(),
+ g->calcTileCollection(mVertexes, img, getMarkerPosition(),
(mDimension.height - img->getHeight()) / 2);
}
}
else
{
- g->calcTile(mVertexes, buttons[1].grid[HSTART], x, y);
+ g->calcTileCollection(mVertexes,
+ buttons[1].grid[HSTART], x, y);
const int width = buttons[1].grid[HSTART]->getWidth();
w -= width;
@@ -188,12 +190,15 @@ void Slider::draw(gcn::Graphics *graphics)
x += w;
if (buttons[1].grid[HEND])
- g->calcTile(mVertexes, buttons[1].grid[HEND], x, y);
+ {
+ g->calcTileCollection(mVertexes,
+ buttons[1].grid[HEND], x, y);
+ }
const Image *const img = buttons[1].grid[HGRIP];
if (img)
{
- g->calcTile(mVertexes, img, getMarkerPosition(),
+ g->calcTileCollection(mVertexes, img, getMarkerPosition(),
(mDimension.height - img->getHeight()) / 2);
}
}