summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-23 17:11:15 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-23 17:56:20 +0300
commitbec451007ce9471004ec4a8357cea3cb7712de55 (patch)
treeee085db2b2dc6fc012f4d94daf2e4a75bbdee0b5 /src/gui/widgets
parent813c0ece9e8063badf15f53ac5e0a759dcaa6d73 (diff)
downloadmanaplus-bec451007ce9471004ec4a8357cea3cb7712de55.tar.gz
manaplus-bec451007ce9471004ec4a8357cea3cb7712de55.tar.bz2
manaplus-bec451007ce9471004ec4a8357cea3cb7712de55.tar.xz
manaplus-bec451007ce9471004ec4a8357cea3cb7712de55.zip
Join exguichan Window and normal Window classes.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/window.cpp121
-rw-r--r--src/gui/widgets/window.h216
2 files changed, 323 insertions, 14 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 8388ae64e..3404bb573 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -20,6 +20,49 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * 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.
+ */
+
#include "gui/widgets/window.h"
#include "client.h"
@@ -48,8 +91,18 @@ int Window::mouseResize = 0;
Window::Window(const std::string &caption, const bool modal,
Window *const parent, std::string skin) :
- gcn::Window(nullptr, caption),
+ gcn::Container(nullptr),
+ MouseListener(),
WidgetListener(),
+ mCaption(caption),
+ mAlignment(Graphics::CENTER),
+ mPadding(2),
+ mTitleBarHeight(16),
+ mMovable(true),
+ mOpaque(true),
+ mDragOffsetX(0),
+ mDragOffsetY(0),
+ mMoved(false),
mSkin(nullptr),
mDefaultX(0),
mDefaultY(0),
@@ -91,6 +144,9 @@ Window::Window(const std::string &caption, const bool modal,
windowInstances++;
+// mFrameSize = 1;
+ addMouseListener(this);
+
setFrameSize(0);
setPadding(3);
setTitleBarHeight(20);
@@ -608,18 +664,14 @@ void Window::setVisible(const bool visible, const bool forceSticky)
// Check if the window is off screen...
if (visible)
- {
ensureOnScreen();
- }
else
- {
mResizeHandles = 0;
- }
if (mStickyButtonLock)
- gcn::Window::setVisible(visible);
+ gcn::Container::setVisible(visible);
else
- gcn::Window::setVisible((!forceSticky && mSticky) || visible);
+ gcn::Container::setVisible((!forceSticky && mSticky) || visible);
if (visible)
{
if (mPlayVisibleSound)
@@ -655,8 +707,15 @@ void Window::scheduleDelete()
void Window::mousePressed(MouseEvent &event)
{
- // Let Guichan move window to top and figure out title bar drag
- gcn::Window::mousePressed(event);
+ if (event.getSource() == this)
+ {
+ if (getParent())
+ getParent()->moveToTop(this);
+
+ mDragOffsetX = event.getX();
+ mDragOffsetY = event.getY();
+ mMoved = event.getY() <= static_cast<int>(mTitleBarHeight);
+ }
if (event.getButton() == MouseEvent::LEFT)
{
@@ -705,7 +764,6 @@ void Window::mouseReleased(MouseEvent &event A_UNUSED)
gui->setCursorType(Cursor::CURSOR_POINTER);
}
- // This should be the responsibility of Guichan (and is from 0.8.0 on)
mMoved = false;
}
@@ -771,8 +829,16 @@ void Window::mouseDragged(MouseEvent &event)
{
if (canMove())
{
- // Let Guichan handle title bar drag
- gcn::Window::mouseDragged(event);
+ if (!event.isConsumed() && event.getSource() == this)
+ {
+ if (isMovable() && mMoved)
+ {
+ setPosition(event.getX() - mDragOffsetX + getX(),
+ event.getY() - mDragOffsetY + getY());
+ }
+
+ event.consume();
+ }
}
else
{
@@ -1255,6 +1321,37 @@ bool Window::getOptionBool(const std::string &name, const bool def) const
return def;
}
+Rectangle Window::getChildrenArea()
+{
+ return Rectangle(mPadding,
+ mTitleBarHeight,
+ mDimension.width - mPadding * 2,
+ mDimension.height - mPadding - mTitleBarHeight);
+}
+
+void Window::resizeToContent()
+{
+ int w = 0;
+ int h = 0;
+ for (WidgetListConstIterator it = mWidgets.begin();
+ it != mWidgets.end(); ++ it)
+ {
+ const Widget *const widget = *it;
+ const int x = widget->getX();
+ const int y = widget->getY();
+ const int width = widget->getWidth();
+ const int height = widget->getHeight();
+ if (x + width > w)
+ w = x + width;
+
+ if (y + height > h)
+ h = y + height;
+ }
+
+ setSize(w + 2 * mPadding,
+ h + mPadding + mTitleBarHeight);
+}
+
#ifdef USE_PROFILER
void Window::logic()
{
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 50babfce4..9bf1b4b7a 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -20,14 +20,58 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * 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 GUI_WIDGETS_WINDOW_H
#define GUI_WIDGETS_WINDOW_H
#include "render/graphics.h"
+#include "listeners/mouselistener.h"
#include "listeners/widgetlistener.h"
-#include "gui/base/widgets/window.hpp"
+#include "gui/base/widgets/container.hpp"
#include "localconsts.h"
@@ -44,7 +88,8 @@ class WindowContainer;
*
* \ingroup GUI
*/
-class Window : public gcn::Window,
+class Window : public gcn::Container,
+ public MouseListener,
private WidgetListener
{
public:
@@ -418,6 +463,124 @@ class Window : public gcn::Window,
bool isWindowVisible() const A_WARN_UNUSED
{ return mVisible; }
+ /**
+ * Sets the padding of the window. The padding is the distance between the
+ * window border and the content.
+ *
+ * @param padding The padding of the window.
+ * @see getPadding
+ */
+ void setPadding(unsigned int padding)
+ { mPadding = padding; }
+
+ /**
+ * Gets the padding of the window. The padding is the distance between the
+ * window border and the content.
+ *
+ * @return The padding of the window.
+ * @see setPadding
+ */
+ unsigned int getPadding() const
+ { return mPadding; }
+
+ /**
+ * Sets the title bar height.
+ *
+ * @param height The title height value.
+ * @see getTitleBarHeight
+ */
+ void setTitleBarHeight(unsigned int height)
+ { mTitleBarHeight = height; }
+
+ /**
+ * Gets the title bar height.
+ *
+ * @return The title bar height.
+ * @see setTitleBarHeight
+ */
+ unsigned int getTitleBarHeight()
+ { return mTitleBarHeight; }
+
+ /**
+ * Sets the caption of the window.
+ *
+ * @param caption The caption of the window.
+ * @see getCaption
+ */
+ void setCaption(const std::string& caption)
+ { mCaption = caption; }
+
+ /**
+ * Gets the caption of the window.
+ *
+ * @return the caption of the window.
+ * @see setCaption
+ */
+ const std::string& getCaption() const
+ { return mCaption; }
+
+ /**
+ * Sets the alignment of the caption.
+ *
+ * @param alignment The alignment of the caption.
+ * @see getAlignment, Graphics
+ */
+ void setAlignment(Graphics::Alignment alignment)
+ { mAlignment = alignment; }
+
+ /**
+ * Gets the alignment of the caption.
+ *
+ * @return The alignment of caption.
+ * @see setAlignment, Graphics
+ */
+ Graphics::Alignment getAlignment() const
+ { return mAlignment; }
+
+ /**
+ * Sets the window to be moveble or not.
+ *
+ * @param movable True if the window should be movable, false otherwise.
+ * @see isMovable
+ */
+ void setMovable(bool movable)
+ { mMovable = movable; }
+
+ /**
+ * Checks if the window is movable.
+ *
+ * @return True if the window is movable, false otherwise.
+ * @see setMovable
+ */
+ bool isMovable() const
+ { return mMovable; }
+
+ /**
+ * Sets the window to be opaque or not. An opaque window will draw it's background
+ * and it's content. A non opaque window will only draw it's content.
+ *
+ * @param opaque True if the window should be opaque, false otherwise.
+ * @see isOpaque
+ */
+ void setOpaque(bool opaque)
+ { mOpaque = opaque; }
+
+ /**
+ * Checks if the window is opaque.
+ *
+ * @return True if the window is opaque, false otherwise.
+ * @see setOpaque
+ */
+ bool isOpaque()
+ { return mOpaque; }
+
+ virtual Rectangle getChildrenArea();
+
+ /**
+ * Resizes the window to fit the content.
+ */
+ virtual void resizeToContent();
+
#ifdef USE_PROFILER
virtual void logic();
#endif
@@ -437,6 +600,55 @@ class Window : public gcn::Window,
int getTitlePadding() const A_WARN_UNUSED
{ return mTitlePadding; }
+ /**
+ * Holds the caption of the window.
+ */
+ std::string mCaption;
+
+ /**
+ * Holds the alignment of the caption.
+ */
+ Graphics::Alignment mAlignment;
+
+ /**
+ * Holds the padding of the window.
+ */
+ unsigned int mPadding;
+
+ /**
+ * Holds the title bar height of the window.
+ */
+ unsigned int mTitleBarHeight;
+
+ /**
+ * True if the window is movable, false otherwise.
+ */
+ bool mMovable;
+
+ /**
+ * True if the window is opaque, false otherwise.
+ */
+ bool mOpaque;
+
+ /**
+ * Holds a drag offset as an x coordinate where the drag of the window
+ * started if the window is being dragged. It's used to move the window
+ * correctly when dragged.
+ */
+ int mDragOffsetX;
+
+ /**
+ * Holds a drag offset as an y coordinate where the drag of the window
+ * started if the window is being dragged. It's used to move the window
+ * correctly when dragged.
+ */
+ int mDragOffsetY;
+
+ /**
+ * True if the window is being moved, false otherwise.
+ */
+ bool mMoved;
+
Skin *mSkin; /**< Skin in use by this window */
int mDefaultX; /**< Default window X position */
int mDefaultY; /**< Default window Y position */