1 files changed, 31 insertions, 18 deletions

@@ -43,28 +43,36 @@ MapeditFrame::MapeditFrame(Map map, std::string filename) : wxFrame(NULL, wxID_A
   
   SetMenuBar(menuBar);
   
-  wxBoxSizer* sizermain = new wxBoxSizer(wxVERTICAL);
-  wxSplitterWindow* splitter = new wxSplitterWindow(this, wxID_ANY);
-  splitter->SetSashGravity(0.0);
-  splitter->SetMinimumPaneSize(50);
-  sizermain->Add(splitter, 1, wxEXPAND, 0);
+  // Layout 1: Splitter between map tree and layout 2
+  // Layout 2: Non-splitter between layout 3 and tile chooser
+  // Layout 3: Splitter between map editor and properties editor
   
-  wxPanel* tileEditorPanel = new wxPanel(splitter, wxID_ANY);
-  tileEditor = new TileWidget(tileEditorPanel, wxID_ANY, 6, 6, wxPoint(0,0));
-  wxBoxSizer* tileSizer = new wxBoxSizer(wxVERTICAL);
-  tileSizer->Add(tileEditor, 1, wxEXPAND, 0);
-  tileEditorPanel->SetSizer(tileSizer);
+  wxSplitterWindow* layout3 = new wxSplitterWindow(this, wxID_ANY);
+  layout3->SetSashGravity(1.0);
+  layout3->SetMinimumPaneSize(20);
   
-  wxPanel* mapEditorPanel = new wxPanel(splitter, wxID_ANY);
-  mapEditor = new MapeditWidget(mapEditorPanel, wxID_ANY, &this->map, tileEditor, wxPoint(0,0));
-  wxBoxSizer* mapSizer = new wxBoxSizer(wxVERTICAL);
-  mapSizer->Add(mapEditor, 1, wxEXPAND, 0);
-  mapEditorPanel->SetSizer(mapSizer);
+  tileEditor = new TileWidget(this, wxID_ANY, 6, 6, wxPoint(0,0), wxSize(TILE_WIDTH*6*7,TILE_HEIGHT*10*6));
+  mapEditor = new MapeditWidget(layout3, wxID_ANY, &this->map, tileEditor, wxPoint(0,0), wxSize(GAME_WIDTH*2, GAME_HEIGHT*2));
   
-  splitter->SplitVertically(tileEditorPanel, mapEditorPanel);
+  wxPanel* propertyEditor = new wxPanel(layout3, wxID_ANY);
+  titleBox = new wxTextCtrl(propertyEditor, wxID_ANY, map.getTitle());
+  titleBox->Bind(wxEVT_TEXT, &MapeditFrame::OnTitleChange, this);
   
-  this->SetSizer(sizermain);
-  sizermain->SetSizeHints(this);
+  wxStaticText* titleLabel = new wxStaticText(propertyEditor, wxID_ANY, "Title:");
+  
+  wxFlexGridSizer* propertySizer = new wxFlexGridSizer(1, 2, 9, 25);
+  propertySizer->Add(titleLabel);
+  propertySizer->Add(titleBox, 1, wxEXPAND);
+  propertyEditor->SetSizer(propertySizer);
+  propertySizer->SetSizeHints(propertyEditor);
+  
+  layout3->SplitHorizontally(mapEditor, propertyEditor);
+  
+  wxBoxSizer* sizer2 = new wxBoxSizer(wxHORIZONTAL);
+  sizer2->Add(layout3, 1, wxEXPAND, 0);
+  sizer2->Add(tileEditor, 0, wxALIGN_TOP | wxALIGN_CENTER_HORIZONTAL | wxLEFT, 2);
+  this->SetSizer(sizer2);
+  sizer2->SetSizeHints(this);
 }
 
 void MapeditFrame::OnExit(wxCloseEvent& event)
@@ -156,3 +164,8 @@ void MapeditFrame::OnQuit(wxCommandEvent& event)
 {
   // TODO
 }
+
+void MapeditFrame::OnTitleChange(wxCommandEvent& event)
+{
+  map.setTitle(titleBox->GetLineText(0).ToStdString());
+}