summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-22 02:39:05 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-22 22:16:47 +0300
commitad0c5a085c3c6531db2a84a77d590311ed1d2d8f (patch)
tree6d9d53668eb26f6ae94126a80298d3791b0f8962 /src/gui/widgets
parentc70f14d7dc7d2cde472deb3a7aca60a482b7eb17 (diff)
downloadmanaplus-ad0c5a085c3c6531db2a84a77d590311ed1d2d8f.tar.gz
manaplus-ad0c5a085c3c6531db2a84a77d590311ed1d2d8f.tar.bz2
manaplus-ad0c5a085c3c6531db2a84a77d590311ed1d2d8f.tar.xz
manaplus-ad0c5a085c3c6531db2a84a77d590311ed1d2d8f.zip
Add auto resize feature to equipment window for correct placing slots.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/window.cpp8
-rw-r--r--src/gui/widgets/window.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 3f54ce3cc..9128402ad 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -50,6 +50,10 @@ Window::Window(const std::string &caption, const bool modal,
Widget2(),
gcn::WidgetListener(),
mSkin(nullptr),
+ mDefaultX(0),
+ mDefaultY(0),
+ mDefaultWidth(0),
+ mDefaultHeight(0),
mGrip(nullptr),
mParent(parent),
mLayout(nullptr),
@@ -66,10 +70,6 @@ Window::Window(const std::string &caption, const bool modal,
mMinWinHeight(40),
mMaxWinWidth(mainGraphics->mWidth),
mMaxWinHeight(mainGraphics->mHeight),
- mDefaultX(0),
- mDefaultY(0),
- mDefaultWidth(0),
- mDefaultHeight(0),
mVertexes(new GraphicsVertexes()),
mCaptionOffsetX(7),
mCaptionOffsetY(5),
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index e758a4d99..73cd1c2be 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -428,6 +428,10 @@ class Window : public gcn::Window,
{ return mTitlePadding; }
Skin *mSkin; /**< Skin in use by this window */
+ int mDefaultX; /**< Default window X position */
+ int mDefaultY; /**< Default window Y position */
+ int mDefaultWidth; /**< Default window width */
+ int mDefaultHeight; /**< Default window height */
private:
enum ResizeHandles
@@ -474,10 +478,6 @@ class Window : public gcn::Window,
int mMinWinHeight; /**< Minimum window height */
int mMaxWinWidth; /**< Maximum window width */
int mMaxWinHeight; /**< Maximum window height */
- int mDefaultX; /**< Default window X position */
- int mDefaultY; /**< Default window Y position */
- int mDefaultWidth; /**< Default window width */
- int mDefaultHeight; /**< Default window height */
static int mouseResize; /**< Active resize handles */
static int instances; /**< Number of Window instances */