caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: fix a crash at startup introduced in 75a09c8b.

Browse Source
This commit is contained in:
whitequark 2019-05-23 12:40:40 +00:00
parent e9b9dca2ca
commit f6484c78e7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphicswin.cpp
View File

@ -397,13 +397,15 @@ void GraphicsWindow::Init() {
window = Platform::CreateWindow(); window = Platform::CreateWindow();
if(window) { if(window) {
using namespace std::placeholders; using namespace std::placeholders;
// Do this first, so that if it causes an onRender event we don't try to paint without
// a canvas.
window->SetMinContentSize(720, 670);
window->onClose = std::bind(&SolveSpaceUI::MenuFile, Command::EXIT); window->onClose = std::bind(&SolveSpaceUI::MenuFile, Command::EXIT);
window->onRender = std::bind(&GraphicsWindow::Paint, this); window->onRender = std::bind(&GraphicsWindow::Paint, this);
window->onKeyboardEvent = std::bind(&GraphicsWindow::KeyboardEvent, this, _1); window->onKeyboardEvent = std::bind(&GraphicsWindow::KeyboardEvent, this, _1);
window->onMouseEvent = std::bind(&GraphicsWindow::MouseEvent, this, _1); window->onMouseEvent = std::bind(&GraphicsWindow::MouseEvent, this, _1);
window->onSixDofEvent = std::bind(&GraphicsWindow::SixDofEvent, this, _1); window->onSixDofEvent = std::bind(&GraphicsWindow::SixDofEvent, this, _1);
window->onEditingDone = std::bind(&GraphicsWindow::EditControlDone, this, _1); window->onEditingDone = std::bind(&GraphicsWindow::EditControlDone, this, _1);
window->SetMinContentSize(720, 670);
PopulateMainMenu(); PopulateMainMenu();
} }
} }