From fa007dafa2c499425e7112095cbda9c2ff5ea20c Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Mon, 19 Jan 2009 00:08:15 -0700 Subject: Fixed overlaps in the last commit by converting the debug window code to use the layout engine. Signed-off-by: Ira Rice --- src/gui/debugwindow.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'src/gui/debugwindow.cpp') diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index b97474af..557c0f5f 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -28,6 +28,8 @@ #include "gui.h" #include "viewport.h" +#include "widgets/layout.h" + #include "../engine.h" #include "../game.h" #include "../particle.h" @@ -46,29 +48,25 @@ DebugWindow::DebugWindow(): loadWindowState(); mFPSLabel = new gcn::Label("[0 FPS]"); - mFPSLabel->setPosition(0,0); mMusicFileLabel = new gcn::Label("Music: "); - mMusicFileLabel->setPosition(0, 15); mMapLabel = new gcn::Label("Map: "); - mMapLabel->setPosition(0, 30); mMiniMapLabel = new gcn::Label("Mini-Map: "); - mMiniMapLabel->setPosition(0, 45); mTileMouseLabel = new gcn::Label("[Mouse: 0, 0]"); - mTileMouseLabel->setPosition(200, 0); mParticleCountLabel = new gcn::Label("[Particle count: 0]"); - mParticleCountLabel->setPosition(200, 15); - - add(mFPSLabel); - add(mMusicFileLabel); - add(mMiniMapLabel); - add(mMapLabel); - add(mTileMouseLabel); - add(mParticleCountLabel); + + place(0, 0, mFPSLabel); + place(3, 0, mTileMouseLabel); + place(0, 1, mMusicFileLabel, 2); + place(3, 1, mParticleCountLabel); + place(0, 2, mMapLabel, 2); + place(0, 3, mMiniMapLabel, 2); + + reflowLayout(375, 0); } void DebugWindow::logic() -- cgit v1.2.3-60-g2f50