Fixed listbox and scrollarea sizes in setup.

2 files changed, 11 insertions, 7 deletions

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index ee50ad06..3cc465f2 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -63,7 +63,7 @@ Setup::Setup(gcn::Container *parent)
   modesListModel = new ModesListModel();
   displayLabel = new gcn::Label("Display settings");
   modesList = new gcn::ListBox(modesListModel);
-  scrollArea = new gcn::ScrollArea(modesList);
+  scrollArea = new ScrollArea(modesList);
   fsCheckBox = new CheckBox("Full screen", false);
   soundLabel = new gcn::Label("Sound settings");
   soundCheckBox = new CheckBox("Sound", false);
@@ -71,7 +71,8 @@ Setup::Setup(gcn::Container *parent)
   cancelButton = new Button("Cancel");
   
   /* Set dimension */
-  scrollArea->setDimension(gcn::Rectangle(0,0,120,50));
+  scrollArea->setDimension(gcn::Rectangle(0,0,90,50));
+  modesList->setDimension(gcn::Rectangle(0,0,60,50));
   displayLabel->setDimension(gcn::Rectangle(0,0,100,16));
   applyButton->setDimension(gcn::Rectangle(0,0,80, 16));
   cancelButton->setDimension(gcn::Rectangle(0,0,80, 16));
@@ -83,9 +84,9 @@ Setup::Setup(gcn::Container *parent)
   /* Set position */
   scrollArea->setPosition(10,40);
   displayLabel->setPosition(10,10);
-  soundLabel->setPosition(10,90);
-  fsCheckBox->setPosition(110,36);
-  soundCheckBox->setPosition(10,116);
+  soundLabel->setPosition(10,110);
+  fsCheckBox->setPosition(120,36);
+  soundCheckBox->setPosition(10,130);
   applyButton->setPosition(10,190);
   cancelButton->setPosition(150,190);
   
@@ -105,7 +106,7 @@ Setup::Setup(gcn::Container *parent)
   setSize(240,216);
   setLocationRelativeTo(getParent());
 
-  //TODO: load default settings
+  /* load default settings */
   modesList->setSelected(1);
   if(config.getValue("screen",0) == 1) 
     fsCheckBox->setMarked(true);
@@ -120,6 +121,8 @@ Setup::~Setup() {
   delete modesList;
   delete scrollArea;
   delete fsCheckBox;
+  delete soundCheckBox;
+  delete soundLabel;
   delete displayLabel;
   delete applyButton;
   delete cancelButton;
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 7768ef34..c32dcccd 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -27,6 +27,7 @@
 #include "gui.h"
 #include "button.h"
 #include "checkbox.h"
+#include "scrollarea.h"
 #include "../graphic/graphic.h"
 #include <allegro.h>
 #ifdef WIN32
@@ -54,7 +55,7 @@ class Setup : public Window, public gcn::ActionListener {
   CheckBox *fsCheckBox;
   gcn::Label *soundLabel;
   CheckBox *soundCheckBox;
-  gcn::ScrollArea *scrollArea;
+  ScrollArea *scrollArea;
   gcn::ListBox *modesList;
   Button *applyButton;
   Button *cancelButton;