Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix map editor toolbar on windows

This commit is contained in:
Mark Vejvoda 2013-06-04 07:21:01 +00:00
parent b6780d2af7
commit a313b26d74
2 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
source/glest_map_editor/main.cpp
View File

@ -114,11 +114,33 @@ void MainWindow::onToolPlayer(wxCommandEvent& event){
PopupMenu(menuBrushStartLocation);
}
void MainToolBar::onMouseMove(wxMouseEvent &event) {
#ifdef WIN32
if(this->GetParent() != NULL && this->GetParent()->GetParent() != NULL) {
MainWindow *mainWindow = dynamic_cast<MainWindow *>(this->GetParent()->GetParent());
if(mainWindow != NULL) {
mainWindow->refreshMapRender();
}
}
#endif
event.Skip();
}
BEGIN_EVENT_TABLE(MainToolBar, wxToolBar)
EVT_MOTION(MainToolBar::onMouseMove)
END_EVENT_TABLE()
void MainWindow::init(string fname) {
#if wxCHECK_VERSION(2, 9, 1)
#if wxCHECK_VERSION(2, 9, 3)
glCanvas->setCurrentGLContext();
//printf("setcurrent #1\n");
#elif wxCHECK_VERSION(2, 9, 1)
#else
glCanvas->SetCurrent();
//printf("setcurrent #2\n");
#endif
//menus
@ -291,7 +313,7 @@ void MainWindow::init(string fname) {
SetStatusText(wxT("Value: 0"), siBRUSH_VALUE);
SetStatusText(wxT("Radius: 1"), siBRUSH_RADIUS);
wxToolBar *toolbar = new wxToolBar(this->panel, wxID_ANY);
wxToolBar *toolbar = new MainToolBar(this->panel, wxID_ANY);
toolbar->AddTool(miEditUndo, _("undo"), wxBitmap(edit_undo), _("Undo"));
toolbar->AddTool(miEditRedo, _("redo"), wxBitmap(edit_redo), _("Redo"));
toolbar->AddTool(miEditRandomizeHeights, _("randomizeHeights"), wxBitmap(edit_randomize_heights), _("Randomize Heights"));
@ -325,7 +347,7 @@ void MainWindow::init(string fname) {
toolbar->AddTool(toolPlayer, _("brush_player"), wxBitmap(brush_players_player), _("Player start position"));
toolbar->Realize();
wxToolBar *toolbar2 = new wxToolBar(this->panel, wxID_ANY);
wxToolBar *toolbar2 = new MainToolBar(this->panel, wxID_ANY);
toolbar2->AddTool(miBrushGradient + 1, _("brush_gradient_n5"), wxBitmap(brush_gradient_n5));
toolbar2->AddTool(miBrushGradient + 2, _("brush_gradient_n4"), wxBitmap(brush_gradient_n4));
toolbar2->AddTool(miBrushGradient + 3, _("brush_gradient_n3"), wxBitmap(brush_gradient_n3));
@ -578,6 +600,10 @@ void MainWindow::onMouseMove(wxMouseEvent &event, int x, int y) {
resourceUnderMouse = 0;
objectUnderMouse = currObject;
}
//#ifdef WIN32
//repaint = true;
//#endif
}
lastX = x;
lastY = y;
@ -610,14 +636,18 @@ void MainWindow::onPaint(wxPaintEvent &event) {
lastPaintEvent.start();
if(panel) panel->Update();
if(menuBar) menuBar->Update();
if(panel) panel->Refresh(false);
if(menuBar) menuBar->Refresh(false);
refreshMapRender();
event.Skip();
}
void MainWindow::refreshMapRender() {
if(program && glCanvas) {
program->renderMap(glCanvas->GetClientSize().x, glCanvas->GetClientSize().y);
glCanvas->SwapBuffers();
}
event.Skip();
}
void MainWindow::onMenuFileLoad(wxCommandEvent &event) {
@ -1563,6 +1593,10 @@ bool App::OnInit() {
#ifdef WIN32
wxPoint pos = mainWindow->GetScreenPosition();
wxSize size = mainWindow->GetSize();
mainWindow->SetSize(pos.x, pos.y, 1, 1, wxSIZE_FORCE);
//mainWindow->Update();
mainWindow->SetSize(pos.x, pos.y, size.x-1, size.y, wxSIZE_FORCE);
mainWindow->Update();
#endif

14
source/glest_map_editor/main.h
View File

@ -79,6 +79,19 @@ const char *surface_descs[] = {
"Grass", "Sec. grass", "Road", "Stone", "Ground"
};
class MainToolBar : public wxToolBar {
private:
DECLARE_EVENT_TABLE()
public:
MainToolBar(wxWindow *parent,
wxWindowID id) : wxToolBar(parent,id) {}
void onMouseMove(wxMouseEvent &event);
};
// =====================================================
// class MainWindow
// =====================================================
@ -196,6 +209,7 @@ public:
MainWindow(string appPath);
~MainWindow();
void refreshMapRender();
void init(string fname);
void onClose(wxCloseEvent &event);