From b2ad90fef0e31a1d8635b817940d9bf71320b588 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 17 Mar 2015 17:21:10 -0400
Subject: Fixed bug with starting position label going under the adjacent
 button in map editor

---
 tools/mapedit/src/frame.cpp | 6 ++++--
 tools/mapedit/src/frame.h   | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/mapedit/src/frame.cpp b/tools/mapedit/src/frame.cpp
index 2540175..2f85905 100644
--- a/tools/mapedit/src/frame.cpp
+++ b/tools/mapedit/src/frame.cpp
@@ -155,14 +155,13 @@ MapeditFrame::MapeditFrame(std::unique_ptr<World> world) : wxFrame(NULL, wxID_AN
   mapEditor->frame = this;
   
   // Set up property editor
-  wxPanel* propertyEditor = new wxPanel(layout3, wxID_ANY);//, wxDefaultPosition, wxSize(-1, 100));
+  propertyEditor = new wxPanel(layout3, wxID_ANY);//, wxDefaultPosition, wxSize(-1, 100));
   titleBox = new UndoableTextBox(propertyEditor, MAP_TITLE_TEXTBOX, currentMap->getTitle(), "Edit Map Title", this);
   titleBox->SetMaxLength(40);
   
   wxStaticText* titleLabel = new wxStaticText(propertyEditor, wxID_ANY, "Title:");
   
   startposLabel = new wxStaticText(propertyEditor, wxID_ANY, "Starting Position:");
-  SetStartposLabel();
   
   setStartposButton = new wxButton(propertyEditor, SET_STARTPOS_BUTTON, "Set Starting Position");
   cancelStartposButton = new wxButton(propertyEditor, CANCEL_STARTPOS_BUTTON, "Cancel");
@@ -257,6 +256,8 @@ MapeditFrame::MapeditFrame(std::unique_ptr<World> world) : wxFrame(NULL, wxID_AN
   dontSelectMap = true;
   mapTree->SelectItem(currentMap->getTreeItemId());
   dontSelectMap = false;
+  
+  SetStartposLabel();
 }
 
 void MapeditFrame::OnExit(wxCloseEvent& event)
@@ -731,6 +732,7 @@ void MapeditFrame::SetStartposLabel()
   mappos_out << ")";
   
   startposLabel->SetLabel(mappos_out.str());
+  propertyEditor->GetSizer()->SetSizeHints(propertyEditor);
 }
 
 void MapeditFrame::UpdateUndoLabels()
diff --git a/tools/mapedit/src/frame.h b/tools/mapedit/src/frame.h
index ffa6c7d..d201e86 100644
--- a/tools/mapedit/src/frame.h
+++ b/tools/mapedit/src/frame.h
@@ -78,6 +78,7 @@ class MapeditFrame : public wxFrame {
     wxMenu* menuFile;
     wxSplitterWindow* layout1;
     wxSplitterWindow* layout3;
+    wxPanel* propertyEditor;
     
     // Notebook
     wxNotebook* notebook;
-- 
cgit 1.4.1