summaryrefslogtreecommitdiff
path: root/src/guichan
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-05-06 18:03:52 +0300
committerAndrei Karas <akaras@inbox.ru>2012-05-06 20:52:08 +0300
commitf0ae9007f666580259ca8c120f7aaee58a63f85a (patch)
treefebc9da1d2ee1a5d3f85096727cd8c26d036ea5e /src/guichan
parentf7c9165e0f59a33404a486c0b154a2c21ed9a9fa (diff)
downloadManaVerse-f0ae9007f666580259ca8c120f7aaee58a63f85a.tar.gz
ManaVerse-f0ae9007f666580259ca8c120f7aaee58a63f85a.tar.bz2
ManaVerse-f0ae9007f666580259ca8c120f7aaee58a63f85a.tar.xz
ManaVerse-f0ae9007f666580259ca8c120f7aaee58a63f85a.zip
Fix code style.
Diffstat (limited to 'src/guichan')
-rw-r--r--src/guichan/graphics.cpp1
-rw-r--r--src/guichan/include/guichan/widgets/imagebutton.hpp124
-rw-r--r--src/guichan/widgets/icon.cpp8
-rw-r--r--src/guichan/widgets/imagebutton.cpp170
4 files changed, 1 insertions, 302 deletions
diff --git a/src/guichan/graphics.cpp b/src/guichan/graphics.cpp
index 1f6cb8a64..1c99d899e 100644
--- a/src/guichan/graphics.cpp
+++ b/src/guichan/graphics.cpp
@@ -145,7 +145,6 @@ namespace gcn
void Graphics::drawImage(const Image* image A_UNUSED,
int dstX A_UNUSED, int dstY A_UNUSED)
{
- throw GCN_EXCEPTION("Not implimented.");
}
void Graphics::setFont(Font* font)
diff --git a/src/guichan/include/guichan/widgets/imagebutton.hpp b/src/guichan/include/guichan/widgets/imagebutton.hpp
deleted file mode 100644
index 42b217fbc..000000000
--- a/src/guichan/include/guichan/widgets/imagebutton.hpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/* _______ __ __ __ ______ __ __ _______ __ __
- * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
- * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
- * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- * be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_IMAGEBUTTON_HPP
-#define GCN_IMAGEBUTTON_HPP
-
-#include "guichan/platform.hpp"
-#include "guichan/widgets/button.hpp"
-
-namespace gcn
-{
- class Image;
-
- /**
- * An implementation of a regular clickable button. Unlike a normal button an image
- * button is capable of displaying an image instead of a simple text caption.
- * Whenever an image button is clicked an action event will be sent to the action
- * listener's of the image button.
- *
- * @see Button
- */
- class GCN_CORE_DECLSPEC ImageButton : public gcn::Button
- {
- public:
- /**
- * Default constructor.
- */
- ImageButton();
-
- /**
- * Constructor.
- *
- * @param filename The filename of the image to display.
- */
- ImageButton(const std::string& filename);
-
- /**
- * Constructor.
- *
- * @param image The image to display.
- */
- ImageButton(const Image* image);
-
- /**
- * Destructor.
- */
- virtual ~ImageButton();
-
- /**
- * Sets the image to display. Existing Image is freed automatically,
- * if it was loaded internally.
- *
- * @param image The image to display.
- */
- void setImage(const Image* image);
-
- /**
- * Gets current image.
- *
- * @return The current image.
- */
- const Image* getImage() const;
-
-
- // Inherited from Widget
-
- void draw(gcn::Graphics* graphics);
-
- protected:
- /**
- * The image to display.
- */
- const Image* mImage;
-
- /**
- * True if the image has been loaded internally, false otherwise.
- * An image not loaded internally should not be deleted in the
- * destructor.
- */
- bool mInternalImage;
- };
-}
-#endif
diff --git a/src/guichan/widgets/icon.cpp b/src/guichan/widgets/icon.cpp
index dca3400ba..d3d4d65ff 100644
--- a/src/guichan/widgets/icon.cpp
+++ b/src/guichan/widgets/icon.cpp
@@ -106,13 +106,7 @@ namespace gcn
return mImage;
}
- void Icon::draw(Graphics* graphics)
+ void Icon::draw(Graphics* graphics A_UNUSED)
{
- if (mImage)
- {
- const int x = (getWidth() - mImage->getWidth()) / 2;
- const int y = (getHeight() - mImage->getHeight()) / 2;
- graphics->drawImage(mImage, x, y);
- }
}
}
diff --git a/src/guichan/widgets/imagebutton.cpp b/src/guichan/widgets/imagebutton.cpp
deleted file mode 100644
index 5a0000be2..000000000
--- a/src/guichan/widgets/imagebutton.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/* _______ __ __ __ ______ __ __ _______ __ __
- * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
- * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
- * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- * be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "guichan/widgets/imagebutton.hpp"
-
-#include "guichan/graphics.hpp"
-#include "guichan/image.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
- ImageButton::ImageButton() :
- mImage(nullptr),
- mInternalImage(false)
- {
- setWidth(0);
- setHeight(0);
- }
-
- ImageButton::ImageButton(const std::string& filename) :
- mImage(nullptr),
- mInternalImage(false)
- {
- mImage = Image::load(filename);
- mInternalImage = true;
- setWidth(mImage->getWidth() + mImage->getWidth() / 2);
- setHeight(mImage->getHeight() + mImage->getHeight() / 2);
- }
-
- ImageButton::ImageButton(const Image* image) :
- mImage(image),
- mInternalImage(false)
- {
- setWidth(mImage->getWidth() + mImage->getWidth() / 2);
- setHeight(mImage->getHeight() + mImage->getHeight() / 2);
- }
-
- ImageButton::~ImageButton()
- {
- if (mInternalImage)
- {
- delete mImage;
- mImage = nullptr;
- }
- }
-
- void ImageButton::setImage(const Image* image)
- {
- if (mInternalImage)
- {
- delete mImage;
- mImage = nullptr;
- }
-
- mImage = image;
- mInternalImage = false;
- }
-
- const Image* ImageButton::getImage() const
- {
- return mImage;
- }
-
- void ImageButton::draw(Graphics* graphics)
- {
- gcn::Color faceColor = getBaseColor();
- gcn::Color highlightColor, shadowColor;
- int alpha = getBaseColor().a;
-
- if (isPressed())
- {
- faceColor = faceColor - 0x303030;
- faceColor.a = alpha;
- highlightColor = faceColor - 0x303030;
- highlightColor.a = alpha;
- shadowColor = faceColor + 0x303030;
- shadowColor.a = alpha;
- }
- else
- {
- highlightColor = faceColor + 0x303030;
- highlightColor.a = alpha;
- shadowColor = faceColor - 0x303030;
- shadowColor.a = alpha;
- }
-
- graphics->setColor(faceColor);
- graphics->fillRectangle(Rectangle(1, 1,
- getDimension().width - 1, getHeight() - 1));
-
- graphics->setColor(highlightColor);
- graphics->drawLine(0, 0, getWidth() - 1, 0);
- graphics->drawLine(0, 1, 0, getHeight() - 1);
-
- graphics->setColor(shadowColor);
- graphics->drawLine(getWidth() - 1, 1, getWidth() - 1, getHeight() - 1);
- graphics->drawLine(1, getHeight() - 1,
- getWidth() - 1, getHeight() - 1);
-
- graphics->setColor(getForegroundColor());
-
- const int textX = (getWidth() - (mImage
- ? mImage->getWidth() : 0) ) / 2;
- const int textY = (getHeight() - (mImage
- ? mImage->getHeight() : 0) ) / 2;
-
- if (isPressed())
- {
- if (mImage)
- graphics->drawImage(mImage, textX + 1, textY + 1);
- }
- else
- {
- if (mImage)
- graphics->drawImage(mImage, textX, textY);
-
- if (isFocused())
- {
- graphics->drawRectangle(Rectangle(2, 2,
- getWidth() - 4, getHeight() - 4));
- }
- }
- }
-}