summaryrefslogtreecommitdiff
path: root/src/gui/guildwindow.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-11 13:31:52 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-11 13:31:52 +0000
commit4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe (patch)
tree6b8aea437d454de40808a7f1289c264d7bd563e3 /src/gui/guildwindow.cpp
parentf97ddedaa9672c78147fc13282bd14a5be46eb19 (diff)
downloadmana-client-4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe.tar.gz
mana-client-4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe.tar.bz2
mana-client-4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe.tar.xz
mana-client-4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe.zip
Ported trunk over to Guichan 0.8.0. Based on merge from 0.0 branch, but because
of quite a bit of GUI differences there were additional changes and probably additional issues. You have been warned. ;) Merged revisions 4045-4049,4051-4059 via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4045 | b_lindeijer | 2008-04-07 17:23:07 +0200 (Mon, 07 Apr 2008) | 3 lines Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for gcn::TabbedArea usage) ........ r4059 | b_lindeijer | 2008-04-09 16:25:42 +0200 (Wed, 09 Apr 2008) | 2 lines Fixed problem with row height in shop list box. ........
Diffstat (limited to 'src/gui/guildwindow.cpp')
-rw-r--r--src/gui/guildwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 970c6ce1..eb0faa35 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -173,8 +173,8 @@ void GuildWindow::newGuildTab(const std::string &guildName)
// Create new tab
GCContainer *tab = new GCContainer();
- tab->setWidth(getWidth() - 2 * tab->getBorderSize());
- tab->setHeight(getHeight() - 2 * tab->getBorderSize());
+ tab->setWidth(getWidth() - 2 * tab->getFrameSize());
+ tab->setHeight(getHeight() - 2 * tab->getFrameSize());
tab->setOpaque(false);
ListBox *list = new ListBox();
list->setListModel(player_node->getGuild(guildName));