From a4bb147cc8321a210b5fe6a6ce776679369d76e8 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 15:24:10 -0700
Subject: Fixed the default size for shortcut windows, as well as added both of
the new shortcut windows to the reset shortcut window.
Signed-off-by: Ira Rice <irarice@gmail.com>
---
src/gui/setup.cpp | 4 ++++
src/gui/shortcutwindow.cpp | 6 ++++--
src/gui/shortcutwindow.h | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 73023eba..bcffbae0 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -43,6 +43,8 @@ extern Window *minimap;
extern Window *skillDialog;
extern Window *statusWindow;
extern Window *itemShortcutWindow;
+extern Window *smileyShortcutWindow;
+extern Window *smileyWindow;
extern Window *tradeWindow;
Setup::Setup():
@@ -136,6 +138,8 @@ void Setup::action(const gcn::ActionEvent &event)
helpWindow->resetToDefaultSize();
skillDialog->resetToDefaultSize();
itemShortcutWindow->resetToDefaultSize();
+ smileyShortcutWindow->resetToDefaultSize();
+ smileyWindow->resetToDefaultSize();
tradeWindow->resetToDefaultSize();
}
}
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index d2aa2c2c..eb9efa84 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -25,14 +25,13 @@
static const int SCROLL_PADDING = 0;
-ShortcutWindow::ShortcutWindow(const char * title,ShortcutContainer *content)
+ShortcutWindow::ShortcutWindow(const char *title, ShortcutContainer *content)
{
setWindowName(title);
// no title presented, title bar is padding so window can be moved.
gcn::Window::setTitleBarHeight(gcn::Window::getPadding());
setShowTitle(false);
setResizable(true);
- setDefaultSize(758, 174, 42, 426);
mItems = content;
@@ -42,6 +41,9 @@ ShortcutWindow::ShortcutWindow(const char * title,ShortcutContainer *content)
setMaxWidth(mItems->getBoxWidth() * mItems->getMaxItems() + border);
setMaxHeight(mItems->getBoxHeight() * mItems->getMaxItems() + border);
+ setDefaultSize(758, 174, mItems->getBoxWidth() + border,
+ (mItems->getBoxHeight() * mItems->getMaxItems()) + border);
+
mScrollArea = new ScrollArea(mItems);
mScrollArea->setPosition(SCROLL_PADDING, SCROLL_PADDING);
mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index c9ba9d2e..b5a23c2c 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -40,7 +40,7 @@ class ShortcutWindow : public Window
/**
* Constructor.
*/
- ShortcutWindow(const char *title,ShortcutContainer *content);
+ ShortcutWindow(const char *title, ShortcutContainer *content);
/**
* Destructor.
--
cgit v1.2.3-70-g09d2