summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/setup.cpp7
-rw-r--r--src/gui/setup_audio.cpp2
-rw-r--r--src/gui/setup_joystick.cpp2
-rw-r--r--src/gui/setup_keyboard.cpp2
-rw-r--r--src/gui/setup_players.cpp4
-rw-r--r--src/gui/setup_video.cpp4
6 files changed, 10 insertions, 11 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 3d31f0db..d38fb2e3 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -19,8 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <algorithm>
-
#include "setup.h"
#include "button.h"
@@ -35,6 +33,7 @@
#include "../utils/dtor.h"
#include "../utils/gettext.h"
+#include <algorithm>
#include <iostream>
extern Window *statusWindow;
@@ -52,7 +51,7 @@ Setup::Setup():
{
setCloseButton(true);
int width = 310;
- int height = 265;
+ int height = 310;
setContentSize(width, height);
static const char *buttonNames[] = {
@@ -71,7 +70,7 @@ Setup::Setup():
}
TabbedArea *panel = new TabbedArea();
- panel->setDimension(gcn::Rectangle(5, 5, 280, 225));
+ panel->setDimension(gcn::Rectangle(5, 5, width - 10, height - 40));
SetupTab *tab;
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 3f7d3520..b9fc1d2d 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -72,7 +72,7 @@ Setup_Audio::Setup_Audio():
place(0, 2, mMusicSlider);
place(1, 2, musicLabel);
- setDimension(gcn::Rectangle(0, 0, 250, 200));
+ setDimension(gcn::Rectangle(0, 0, 290, 250));
}
void Setup_Audio::apply()
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index c9ad5894..f8fc194f 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -57,7 +57,7 @@ Setup_Joystick::Setup_Joystick():
place = h.getPlacer(0, 1);
place(0, 0, mCalibrateButton);
- setDimension(gcn::Rectangle(0, 0, 250, 200));
+ setDimension(gcn::Rectangle(0, 0, 290, 75));
}
void Setup_Joystick::action(const gcn::ActionEvent &event)
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 87f00b6c..cf44731c 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -100,7 +100,7 @@ Setup_Keyboard::Setup_Keyboard():
place(0, 6, mMakeDefaultButton);
place(3, 6, mAssignKeyButton);
- setDimension(gcn::Rectangle(0, 0, 250, 200));
+ setDimension(gcn::Rectangle(0, 0, 295, 250));
}
Setup_Keyboard::~Setup_Keyboard()
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 30ad5f81..1d8649eb 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -46,7 +46,7 @@
#define ROW_HEIGHT 12
// The following column widths really shouldn't be hardcoded but should scale with the size of the widget... except
// that, right now, the widget doesn't exactly scale either.
-#define NAME_COLUMN_WIDTH 155
+#define NAME_COLUMN_WIDTH 195
#define RELATION_CHOICE_COLUMN_WIDTH 80
#define WIDGET_AT(row, column) (((row) * COLUMNS_NR) + column)
@@ -280,7 +280,7 @@ Setup_Players::Setup_Players():
player_relations.addListener(this);
- setDimension(gcn::Rectangle(0, 0, 250, 200));
+ setDimension(gcn::Rectangle(0, 0, 290, 250));
}
Setup_Players::~Setup_Players()
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index c17a5263..53041a9c 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -227,7 +227,7 @@ Setup_Video::Setup_Video():
LayoutHelper h(this);
ContainerPlacer place = h.getPlacer(0, 0);
- place(0, 0, scrollArea, 1, 3).setPadding(2);
+ place(0, 0, scrollArea, 1, 4).setPadding(2);
place(1, 0, mFsCheckBox, 3);
place(1, 1, mOpenGLCheckBox, 3);
place(1, 2, mCustomCursorCheckBox, 3);
@@ -252,7 +252,7 @@ Setup_Video::Setup_Video():
place(2, 8, mOverlayDetailField, 2).setPadding(2);
place(2, 9, mParticleDetailField, 2).setPadding(2);
- setDimension(gcn::Rectangle(0, 0, 280, 200));
+ setDimension(gcn::Rectangle(0, 0, 295, 250));
}
Setup_Video::~Setup_Video()