diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 16:59:56 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 16:59:56 +0100 |
| commit | 551675cb8284b03a1e43be9d11eda0bab7b70139 (patch) | |
| tree | eed1121d421176f4044e5f38190c767f6b905388 /src/gui/setup_video.cpp | |
| parent | ae14594cfa804a89a36312e142498eca7f147cc9 (diff) | |
| parent | d4a407254cfffbb79087c1248650fbaed5d568d8 (diff) | |
| download | mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.gz mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.bz2 mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.xz mana-551675cb8284b03a1e43be9d11eda0bab7b70139.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/graphics.h
src/gui/setup_video.cpp
src/gui/specialswindow.cpp
src/gui/viewport.cpp
src/gui/widgets/container.cpp
src/gui/widgets/container.h
Diffstat (limited to 'src/gui/setup_video.cpp')
| -rw-r--r-- | src/gui/setup_video.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 05bc6c44..5a697160 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -187,16 +187,24 @@ Setup_Video::Setup_Video(): mFpsSlider->addActionListener(this); // Do the layout - getLayout().setHAlign(LayoutCell::FILL); + ContainerPlacer place = getPlacer(0, 0); + place.getCell().setHAlign(LayoutCell::FILL); + place(0, 0, scrollArea, 1, 4).setPadding(2).setHAlign(LayoutCell::FILL); place(1, 0, space, 1, 4); place(2, 0, mFsCheckBox); place(2, 1, mOpenGLCheckBox); place(2, 2, mCustomCursorCheckBox); - place(2, 3, mDisableSDLTransparencyCheckBox, 4); - place(2, 4, mFpsCheckBox); - place(3, 4, mFpsSlider, 2); - place(5, 4, mFpsLabel); + + place = getPlacer(0, 1); + place.getCell().setHAlign(LayoutCell::FILL); + + place(0, 0, space, 3); + place(0, 1, mDisableSDLTransparencyCheckBox, 4); + + place(0, 2, mFpsCheckBox); + place(1, 2, mFpsSlider, 2); + place(3, 2, mFpsLabel); } Setup_Video::~Setup_Video() |