Skip to content
Snippets Groups Projects
Commit faa10d3b authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

tweak

parent 0e79841f
No related branches found
No related tags found
No related merge requests found
...@@ -271,6 +271,7 @@ FlGui::FlGui(int argc, char **argv) ...@@ -271,6 +271,7 @@ FlGui::FlGui(int argc, char **argv)
#endif #endif
graph[0]->win->show(1, argv); graph[0]->win->show(1, argv);
if(graph[0]->menuwin) graph[0]->menuwin->show();
// graphic window should have the initial focus (so we can e.g. directly loop // graphic window should have the initial focus (so we can e.g. directly loop
// through time steps with the keyboard) // through time steps with the keyboard)
......
...@@ -2927,7 +2927,6 @@ graphicWindow::graphicWindow(bool main, int numTiles, bool detachedMenu) ...@@ -2927,7 +2927,6 @@ graphicWindow::graphicWindow(bool main, int numTiles, bool detachedMenu)
menuwin->resizable(onelab); menuwin->resizable(onelab);
menuwin->size_range(onelab->getMinWindowWidth(), onelab->getMinWindowHeight()); menuwin->size_range(onelab->getMinWindowWidth(), onelab->getMinWindowHeight());
menuwin->end(); menuwin->end();
menuwin->show();
} }
else{ else{
menuwin = 0; menuwin = 0;
...@@ -3025,8 +3024,8 @@ void graphicWindow::hideMenu() ...@@ -3025,8 +3024,8 @@ void graphicWindow::hideMenu()
void graphicWindow::showHideMenu() void graphicWindow::showHideMenu()
{ {
if(menuwin || !onelab) return; if(menuwin || !onelab) return;
if(onelab->w()) hideMenu(); if(onelab->w() < 5) showMenu();
else showMenu(); else hideMenu();
} }
int graphicWindow::getMenuWidth() int graphicWindow::getMenuWidth()
...@@ -3202,8 +3201,8 @@ void graphicWindow::hideMessages() ...@@ -3202,8 +3201,8 @@ void graphicWindow::hideMessages()
void graphicWindow::showHideMessages() void graphicWindow::showHideMessages()
{ {
if(!browser) return; if(!browser) return;
if(browser->h()) hideMessages(); if(browser->h() < 5) showMessages();
else showMessages(); else hideMessages();
} }
int graphicWindow::getMessageHeight() int graphicWindow::getMessageHeight()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment