mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-16 21:33:59 +02:00
Code Issues Projects Releases Wiki Activity

Fixed button-mouse area bug

Browse Source
This commit is contained in:
mathusummut
2018-06-21 21:20:09 +02:00
parent c15488a212
commit 656816084c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/global/metrics.cpp
View File

@@ -57,7 +57,7 @@ namespace Glest {
displayX = 800; displayX = 800;
displayY = 250; displayY = 250;
displayW = 128; displayW = 160;
displayH = 480; displayH = 480;
} }

8
source/glest_map_editor/main.cpp
View File

@@ -457,7 +457,7 @@ namespace MapEditor {
currentFile = fname; currentFile = fname;
fileName = cutLastExt(extractFileFromDirectoryPath(fname.c_str())); fileName = cutLastExt(extractFileFromDirectoryPath(fname.c_str()));
fileDialog->SetPath(ToUnicode(fname)); fileDialog->SetPath(ToUnicode(fname));
SetTitle(ToUnicode(winHeader + "; " + fname)); SetTitle(ToUnicode(winHeader + " - " + fname));
} else } else
SetTitle(ToUnicode(winHeader)); SetTitle(ToUnicode(winHeader));
//setDirty(false); //setDirty(false);
@@ -534,7 +534,7 @@ namespace MapEditor {
//currentFile = fname; //currentFile = fname;
fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str())); fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str()));
fileDialog->SetPath(ToUnicode(currentFile)); fileDialog->SetPath(ToUnicode(currentFile));
SetTitle(ToUnicode(winHeader + "; " + currentFile)); SetTitle(ToUnicode(winHeader + " - " + currentFile));
} else } else
SetTitle(ToUnicode(winHeader)); SetTitle(ToUnicode(winHeader));
@@ -749,7 +749,7 @@ namespace MapEditor {
fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str())); fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str()));
setDirty(false); setDirty(false);
setExtension(); setExtension();
SetTitle(ToUnicode(winHeader + "; " + currentFile)); SetTitle(ToUnicode(winHeader + " - " + currentFile));
} }
} catch (const string &e) { } catch (const string &e) {
MsgDialog(this, ToUnicode(e), wxT("Exception"), wxOK | wxICON_ERROR).ShowModal(); MsgDialog(this, ToUnicode(e), wxT("Exception"), wxOK | wxICON_ERROR).ShowModal();
@@ -824,7 +824,7 @@ namespace MapEditor {
fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str())); fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str()));
setDirty(false); setDirty(false);
} }
SetTitle(ToUnicode(winHeader + "; " + currentFile)); SetTitle(ToUnicode(winHeader + " - " + currentFile));
} }
void MainWindow::onMenuFileExit(wxCommandEvent &event) { void MainWindow::onMenuFileExit(wxCommandEvent &event) {

5
source/shared_lib/sources/platform/sdl/thread.cpp
View File

@@ -197,7 +197,10 @@ namespace Shared {
//sleep(100); //sleep(100);
MutexSafeWrapper safeMutex(cleanupThreadMutex.get()); MutexSafeWrapper safeMutex(cleanupThreadMutex.get());
cleanupThread.reset(0); try {
cleanupThread.reset(0);
} catch (...) {
}
//printf("In Thread::shutdownThreads Line: %d\n",__LINE__); //printf("In Thread::shutdownThreads Line: %d\n",__LINE__);
} }
} }