summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2008-12-18 18:43:14 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-05 00:41:02 +0100
commit3329815114f2e352b8b1438899bd92c13facd8a1 (patch)
tree04355bbfb6559a558f0ce01ddb8c1da7c519f95a /src
parent550a02997572b5d090b436b7c05d19c1823556a9 (diff)
downloadmana-3329815114f2e352b8b1438899bd92c13facd8a1.tar.gz
mana-3329815114f2e352b8b1438899bd92c13facd8a1.tar.bz2
mana-3329815114f2e352b8b1438899bd92c13facd8a1.tar.xz
mana-3329815114f2e352b8b1438899bd92c13facd8a1.zip
Re-enabled buddy window
Diffstat (limited to 'src')
-rw-r--r--src/channelmanager.cpp2
-rw-r--r--src/gui/buddywindow.cpp12
-rw-r--r--src/gui/buddywindow.h6
3 files changed, 17 insertions, 3 deletions
diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp
index 2a3f4eff..a9654de9 100644
--- a/src/channelmanager.cpp
+++ b/src/channelmanager.cpp
@@ -43,7 +43,7 @@ Channel *ChannelManager::findById(int id) const
itr++)
{
Channel *c = (*itr);
- if (channel->getId() == id)
+ if (c->getId() == id)
{
channel = c;
break;
diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
index 0535f837..25084593 100644
--- a/src/gui/buddywindow.cpp
+++ b/src/gui/buddywindow.cpp
@@ -34,10 +34,13 @@ BuddyWindow::BuddyWindow():
Window(_("Buddy"))
{
setVisible(false);
- setContentSize(124, 202);
+ setWindowName("Buddy Window");
setCaption(_("Buddy List"));
setResizable(true);
setCloseButton(true);
+ setMinWidth(110);
+ setMinHeight(200);
+ setDefaultSize(124, 41, 288, 330);
Image *addImg = ResourceManager::getInstance()->getImage("buddyadd.png");
Image *delImg = ResourceManager::getInstance()->getImage("buddydel.png");
@@ -51,10 +54,15 @@ BuddyWindow::BuddyWindow():
add(delBuddy);
}
- loadWindowState("Buddy");
+ loadWindowState();
}
void BuddyWindow::action(const gcn::ActionEvent &event)
{
}
+
+void BuddyWindow::draw(gcn::Graphics *graphics)
+{
+ Window::draw(graphics);
+}
diff --git a/src/gui/buddywindow.h b/src/gui/buddywindow.h
index 15594b63..dfe356d5 100644
--- a/src/gui/buddywindow.h
+++ b/src/gui/buddywindow.h
@@ -47,6 +47,12 @@ class BuddyWindow : public Window, public gcn::ActionListener
*/
void action(const gcn::ActionEvent &event);
+ /**
+ * Draws the window
+ */
+ void draw(gcn::Graphics *graphics);
+
+
private:
std::list<Avatar*> mBuddyList;
};