summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-21 19:03:43 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-21 19:03:43 +0000
commit18c675031f718523586e72f5e1450bb33d457841 (patch)
tree0ddf923be1033a654bea57b8367fba1babc2b13f
parent963340edef64e5823e514d0c4bebe51fc428ba51 (diff)
downloadmana-18c675031f718523586e72f5e1450bb33d457841.tar.gz
mana-18c675031f718523586e72f5e1450bb33d457841.tar.bz2
mana-18c675031f718523586e72f5e1450bb33d457841.tar.xz
mana-18c675031f718523586e72f5e1450bb33d457841.zip
Fixed missing pixels at bottom and right.
-rw-r--r--ChangeLog1
-rw-r--r--src/gui/menuwindow.cpp9
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 00132908..5802edbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@
* src/resources/action.cpp: Fixed double-free of sprite actions.
* data/maps/new_1-1.tmx: Added back a Lua script for testing.
* src/gui/trade.cpp: Added persistent positioning.
+ * src/gui/menuwindow.cpp: Fixed missing pixels at bottom and right.
2007-10-20 Guillaume Melquiond <guillaume.melquiond@gmail.com>
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 8d4d184d..560ec40a 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -67,22 +67,19 @@ MenuWindow::MenuWindow():
N_("Setup"),
0
};
- int x = 0, y = 3, h = 0;
+ int x = 0, h = 0;
for (const char **curBtn = buttonNames; *curBtn; curBtn++)
{
gcn::Button *btn = new Button(gettext(*curBtn), *curBtn, &listener);
- btn->setPosition(x, y);
+ btn->setPosition(x, 0);
add(btn);
x += btn->getWidth() + 3;
h = btn->getHeight();
}
+ setPosition(windowContainer->getWidth() - x - 3, 3);
setContentSize(x - 3, h);
- setDefaultSize(windowContainer->getWidth() - getWidth() - 1,
- 0,
- x - 3,
- y + h);
}
void MenuWindow::draw(gcn::Graphics *graphics)