summaryrefslogtreecommitdiff
path: root/src/guichan/widgets/slider.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-31 01:27:37 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-31 01:27:37 +0300
commit9d3b975bcb84ad1c61d628de2804751c0d0707dd (patch)
treefe7494b1ecd561a40dc96d088c77d69b6d4ce13e /src/guichan/widgets/slider.cpp
parent1d0044cbc81e547ad688a295288910d58e1a3fb1 (diff)
downloadManaVerse-9d3b975bcb84ad1c61d628de2804751c0d0707dd.tar.gz
ManaVerse-9d3b975bcb84ad1c61d628de2804751c0d0707dd.tar.bz2
ManaVerse-9d3b975bcb84ad1c61d628de2804751c0d0707dd.tar.xz
ManaVerse-9d3b975bcb84ad1c61d628de2804751c0d0707dd.zip
Fix code style and missing members initialisations.
Diffstat (limited to 'src/guichan/widgets/slider.cpp')
-rw-r--r--src/guichan/widgets/slider.cpp63
1 files changed, 31 insertions, 32 deletions
diff --git a/src/guichan/widgets/slider.cpp b/src/guichan/widgets/slider.cpp
index a32209124..3bc9d77aa 100644
--- a/src/guichan/widgets/slider.cpp
+++ b/src/guichan/widgets/slider.cpp
@@ -82,7 +82,7 @@ namespace gcn
setFrameSize(1);
setOrientation(HORIZONTAL);
setValue(scaleStart);
- setStepLength((scaleEnd - scaleStart)/ 10);
+ setStepLength((scaleEnd - scaleStart) / 10);
setMarkerLength(10);
addMouseListener(this);
@@ -122,7 +122,7 @@ namespace gcn
shadowColor.a = alpha;
graphics->setColor(shadowColor);
- graphics->fillRectangle(gcn::Rectangle(0,0,getWidth(),getHeight()));
+ graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
drawMarker(graphics);
}
@@ -142,35 +142,43 @@ namespace gcn
if (getOrientation() == HORIZONTAL)
{
int v = getMarkerPosition();
- graphics->fillRectangle(gcn::Rectangle(v + 1, 1, getMarkerLength() - 2, getHeight() - 2));
+ graphics->fillRectangle(gcn::Rectangle(v + 1, 1,
+ getMarkerLength() - 2, getHeight() - 2));
graphics->setColor(highlightColor);
- graphics->drawLine(v, 0, v + getMarkerLength() - 1,0);
+ graphics->drawLine(v, 0, v + getMarkerLength() - 1, 0);
graphics->drawLine(v, 0, v, getHeight() - 1);
graphics->setColor(shadowColor);
- graphics->drawLine(v + getMarkerLength() - 1, 1, v + getMarkerLength() - 1, getHeight() - 1);
- graphics->drawLine(v + 1, getHeight() - 1, v + getMarkerLength() - 1, getHeight() - 1);
+ graphics->drawLine(v + getMarkerLength() - 1, 1,
+ v + getMarkerLength() - 1, getHeight() - 1);
+ graphics->drawLine(v + 1, getHeight() - 1,
+ v + getMarkerLength() - 1, getHeight() - 1);
if (isFocused())
{
graphics->setColor(getForegroundColor());
- graphics->drawRectangle(Rectangle(v + 2, 2, getMarkerLength() - 4, getHeight() - 4));
+ graphics->drawRectangle(Rectangle(v + 2, 2,
+ getMarkerLength() - 4, getHeight() - 4));
}
}
else
{
int v = (getHeight() - getMarkerLength()) - getMarkerPosition();
- graphics->fillRectangle(gcn::Rectangle(1, v + 1, getWidth() - 2, getMarkerLength() - 2));
+ graphics->fillRectangle(gcn::Rectangle(1, v + 1, getWidth() - 2,
+ getMarkerLength() - 2));
graphics->setColor(highlightColor);
graphics->drawLine(0, v, 0, v + getMarkerLength() - 1);
graphics->drawLine(0, v, getWidth() - 1, v);
graphics->setColor(shadowColor);
- graphics->drawLine(1, v + getMarkerLength() - 1, getWidth() - 1, v + getMarkerLength() - 1);
- graphics->drawLine(getWidth() - 1, v + 1, getWidth() - 1, v + getMarkerLength() - 1);
+ graphics->drawLine(1, v + getMarkerLength() - 1, getWidth() - 1,
+ v + getMarkerLength() - 1);
+ graphics->drawLine(getWidth() - 1, v + 1, getWidth() - 1,
+ v + getMarkerLength() - 1);
if (isFocused())
{
graphics->setColor(getForegroundColor());
- graphics->drawRectangle(Rectangle(2, v + 2, getWidth() - 4, getMarkerLength() - 4));
+ graphics->drawRectangle(Rectangle(2, v + 2, getWidth() - 4,
+ getMarkerLength() - 4));
}
}
}
@@ -185,11 +193,13 @@ namespace gcn
{
if (getOrientation() == HORIZONTAL)
{
- setValue(markerPositionToValue(mouseEvent.getX() - getMarkerLength() / 2));
+ setValue(markerPositionToValue(
+ mouseEvent.getX() - getMarkerLength() / 2));
}
else
{
- setValue(markerPositionToValue(getHeight() - mouseEvent.getY() - getMarkerLength() / 2));
+ setValue(markerPositionToValue(getHeight()
+ - mouseEvent.getY() - getMarkerLength() / 2));
}
distributeActionEvent();
@@ -200,11 +210,13 @@ namespace gcn
{
if (getOrientation() == HORIZONTAL)
{
- setValue(markerPositionToValue(mouseEvent.getX() - getMarkerLength() / 2));
+ setValue(markerPositionToValue(mouseEvent.getX()
+ - getMarkerLength() / 2));
}
else
{
- setValue(markerPositionToValue(getHeight() - mouseEvent.getY() - getMarkerLength() / 2));
+ setValue(markerPositionToValue(getHeight()
+ - mouseEvent.getY() - getMarkerLength() / 2));
}
distributeActionEvent();
@@ -261,7 +273,7 @@ namespace gcn
setValue(getValue() - getStepLength());
distributeActionEvent();
keyEvent.consume();
- }
+ }
}
else
{
@@ -294,44 +306,31 @@ namespace gcn
{
int w;
if (getOrientation() == HORIZONTAL)
- {
w = getWidth();
- }
else
- {
w = getHeight();
- }
double pos = v / ((double)w - getMarkerLength());
return (1.0 - pos) * getScaleStart() + pos * getScaleEnd();
-
}
int Slider::valueToMarkerPosition(double value) const
{
int v;
if (getOrientation() == HORIZONTAL)
- {
v = getWidth();
- }
else
- {
v = getHeight();
- }
- int w = (int)((v - getMarkerLength())
- * (value - getScaleStart())
- / (getScaleEnd() - getScaleStart()));
+ int w = (int)((v - getMarkerLength())
+ * (value - getScaleStart())
+ / (getScaleEnd() - getScaleStart()));
if (w < 0)
- {
return 0;
- }
if (w > v - getMarkerLength())
- {
return v - getMarkerLength();
- }
return w;
}