Skip to content
Snippets Groups Projects
Commit 24f79525 authored by Jonathan Lambrechts's avatar Jonathan Lambrechts
Browse files

fix fullscreen on my laptop (linux, window manager gnome shell)

parent 2b90882f
Branches
Tags
No related merge requests found
...@@ -338,6 +338,9 @@ FlGui::FlGui(int argc, char **argv) ...@@ -338,6 +338,9 @@ FlGui::FlGui(int argc, char **argv)
fullscreen->mode(mode); fullscreen->mode(mode);
fullscreen->end(); fullscreen->end();
fullscreen->fullscreen(); fullscreen->fullscreen();
#if not defined (__APPLE__)
fullscreen->icon(graph[0]->getWindow()->icon());
#endif
// create all other windows // create all other windows
options = new optionWindow(CTX::instance()->deltaFontSize); options = new optionWindow(CTX::instance()->deltaFontSize);
...@@ -1053,7 +1056,12 @@ void window_cb(Fl_Widget *w, void *data) ...@@ -1053,7 +1056,12 @@ void window_cb(Fl_Widget *w, void *data)
} }
else if(str == "fullscreen"){ else if(str == "fullscreen"){
if(!fullscreen){ if(!fullscreen){
int x,y,w,h;
Fl::screen_xywh(x, y, w, h);
FlGui::instance()->fullscreen->resize(x, y, w, h);
FlGui::instance()->fullscreen->valid(0);
FlGui::instance()->fullscreen->show(); FlGui::instance()->fullscreen->show();
while (!FlGui::instance()->fullscreen->valid()) FlGui::wait();
FlGui::instance()->fullscreen->getDrawContext()->copyViewAttributes FlGui::instance()->fullscreen->getDrawContext()->copyViewAttributes
(FlGui::instance()->getCurrentOpenglWindow()->getDrawContext()); (FlGui::instance()->getCurrentOpenglWindow()->getDrawContext());
openglWindow::setLastHandled(FlGui::instance()->fullscreen); openglWindow::setLastHandled(FlGui::instance()->fullscreen);
...@@ -1063,8 +1071,12 @@ void window_cb(Fl_Widget *w, void *data) ...@@ -1063,8 +1071,12 @@ void window_cb(Fl_Widget *w, void *data)
fullscreen = 1; fullscreen = 1;
} }
else{ else{
for(unsigned int i = 0; i < FlGui::instance()->graph.size(); i++)
FlGui::instance()->graph[i]->gl[0]->valid(0);
for(unsigned int i = 0; i < FlGui::instance()->graph.size(); i++) for(unsigned int i = 0; i < FlGui::instance()->graph.size(); i++)
FlGui::instance()->graph[i]->getWindow()->show(); FlGui::instance()->graph[i]->getWindow()->show();
for(unsigned int i = 0; i < FlGui::instance()->graph.size(); i++)
while(!FlGui::instance()->graph[i]->gl[0]->valid()) FlGui::wait();
FlGui::instance()->graph[0]->gl[0]->getDrawContext()->copyViewAttributes FlGui::instance()->graph[0]->gl[0]->getDrawContext()->copyViewAttributes
(FlGui::instance()->getCurrentOpenglWindow()->getDrawContext()); (FlGui::instance()->getCurrentOpenglWindow()->getDrawContext());
openglWindow::setLastHandled(FlGui::instance()->graph[0]->gl[0]); openglWindow::setLastHandled(FlGui::instance()->graph[0]->gl[0]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment