From 8f018529676006ed744138a929fcc621694d6d75 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 28 Dec 2013 13:27:26 +0300 Subject: In renderers replace ImagePattern in methods into Pattern. --- src/gui/widgets/scrollarea.cpp | 24 ++++++++++++------------ src/gui/widgets/slider.cpp | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/gui') diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index ebb91f518..3a69ea0c0 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -479,17 +479,17 @@ void ScrollArea::drawVBar(gcn::Graphics *const graphics) if (vBackground.grid[4]) { - g->drawImagePattern(vBackground.grid[4], + g->drawPattern(vBackground.grid[4], dim.x, dim.y, dim.width, dim.height); } if (vBackground.grid[1]) { - g->drawImagePattern(vBackground.grid[1], + g->drawPattern(vBackground.grid[1], dim.x, dim.y, dim.width, vBackground.grid[1]->getHeight()); } if (vBackground.grid[7]) { - g->drawImagePattern(vBackground.grid[7], + g->drawPattern(vBackground.grid[7], dim.x, dim.height - vBackground.grid[7]->getHeight() + dim.y, dim.width, vBackground.grid[7]->getHeight()); } @@ -502,17 +502,17 @@ void ScrollArea::calcVBar(gcn::Graphics *const graphics) if (vBackground.grid[4]) { - g->calcImagePattern(mVertexes, vBackground.grid[4], + g->calcPattern(mVertexes, vBackground.grid[4], dim.x, dim.y, dim.width, dim.height); } if (vBackground.grid[1]) { - g->calcImagePattern(mVertexes, vBackground.grid[1], + g->calcPattern(mVertexes, vBackground.grid[1], dim.x, dim.y, dim.width, vBackground.grid[1]->getHeight()); } if (vBackground.grid[7]) { - g->calcImagePattern(mVertexes, vBackground.grid[7], + g->calcPattern(mVertexes, vBackground.grid[7], dim.x, dim.height - vBackground.grid[7]->getHeight() + dim.y, dim.width, vBackground.grid[7]->getHeight()); } @@ -525,19 +525,19 @@ void ScrollArea::drawHBar(gcn::Graphics *const graphics) if (hBackground.grid[4]) { - g->drawImagePattern(hBackground.grid[4], + g->drawPattern(hBackground.grid[4], dim.x, dim.y, dim.width, dim.height); } if (hBackground.grid[3]) { - g->drawImagePattern(hBackground.grid[3], + g->drawPattern(hBackground.grid[3], dim.x, dim.y, hBackground.grid[3]->getWidth(), dim.height); } if (hBackground.grid[5]) { - g->drawImagePattern(hBackground.grid[5], + g->drawPattern(hBackground.grid[5], dim.x + dim.width - hBackground.grid[5]->getWidth(), dim.y, hBackground.grid[5]->getWidth(), dim.height); } @@ -550,19 +550,19 @@ void ScrollArea::calcHBar(gcn::Graphics *const graphics) if (hBackground.grid[4]) { - g->calcImagePattern(mVertexes, hBackground.grid[4], + g->calcPattern(mVertexes, hBackground.grid[4], dim.x, dim.y, dim.width, dim.height); } if (hBackground.grid[3]) { - g->calcImagePattern(mVertexes, hBackground.grid[3], + g->calcPattern(mVertexes, hBackground.grid[3], dim.x, dim.y, hBackground.grid[3]->getWidth(), dim.height); } if (hBackground.grid[5]) { - g->calcImagePattern(mVertexes, hBackground.grid[5], + g->calcPattern(mVertexes, hBackground.grid[5], dim.x + dim.width - hBackground.grid[5]->getWidth(), dim.y, hBackground.grid[5]->getWidth(), dim.height); } diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 039af9743..e68482821 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -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()); } @@ -217,7 +217,7 @@ 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; @@ -243,7 +243,7 @@ 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; -- cgit v1.2.3-70-g09d2