diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-04-11 13:31:52 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-04-11 13:31:52 +0000 |
commit | 4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe (patch) | |
tree | 6b8aea437d454de40808a7f1289c264d7bd563e3 /src/gui/playerbox.cpp | |
parent | f97ddedaa9672c78147fc13282bd14a5be46eb19 (diff) | |
download | mana-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/playerbox.cpp')
-rw-r--r-- | src/gui/playerbox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index 8e5f1827..2c633b72 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -39,7 +39,7 @@ ImageRect PlayerBox::background; PlayerBox::PlayerBox(const Player *player): mPlayer(player) { - setBorderSize(2); + setFrameSize(2); if (instances == 0) { @@ -83,7 +83,7 @@ PlayerBox::draw(gcn::Graphics *graphics) { // Draw character int x, y, bs; - bs = getBorderSize(); + bs = getFrameSize(); x = getWidth() / 2 - 16 + bs; y = getHeight() / 2 + bs; mPlayer->draw(static_cast<Graphics*>(graphics), x, y); @@ -91,10 +91,10 @@ PlayerBox::draw(gcn::Graphics *graphics) } void -PlayerBox::drawBorder(gcn::Graphics *graphics) +PlayerBox::drawFrame(gcn::Graphics *graphics) { int w, h, bs; - bs = getBorderSize(); + bs = getFrameSize(); w = getWidth() + bs * 2; h = getHeight() + bs * 2; |