diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index cc1aaa72b20cb3c043f263bd5096cf2bf2158e00..e5b75d380a22a6de55c9a81cf84ac8f0e890ab10 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.192 2002-08-15 22:36:18 geuzaine Exp $ +// $Id: GUI.cpp,v 1.193 2002-08-26 17:41:32 geuzaine Exp $ // // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle // @@ -993,6 +993,7 @@ void GUI::create_graphic_window(int argc, char **argv){ // dummy resizable box Dummy_Box *resize_box = new Dummy_Box(x,0,width-x,glheight); + g_window->resizable(resize_box); // opengl window @@ -1003,8 +1004,6 @@ void GUI::create_graphic_window(int argc, char **argv){ } g_opengl_window->end(); - - g_window->resizable(resize_box); g_window->position(CTX.gl_position[0],CTX.gl_position[1]); g_window->end(); } diff --git a/Fltk/Opengl_Window.cpp b/Fltk/Opengl_Window.cpp index ed8489bb75d981928d81078a7cd38094c2c4c578..c846860a9d0e9f6e1061e5f3224284a892fbf977 100644 --- a/Fltk/Opengl_Window.cpp +++ b/Fltk/Opengl_Window.cpp @@ -1,4 +1,4 @@ -// $Id: Opengl_Window.cpp,v 1.26 2002-05-20 18:28:25 geuzaine Exp $ +// $Id: Opengl_Window.cpp,v 1.27 2002-08-26 17:41:32 geuzaine Exp $ // // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle // @@ -53,13 +53,16 @@ void Opengl_Window::draw() { glViewport(CTX.viewport[0], CTX.viewport[1], CTX.viewport[2], CTX.viewport[3]); } - if((w() != CTX.viewport[2]-CTX.viewport[0]) || - (h() != CTX.viewport[3]-CTX.viewport[1])){ - WID->set_size(CTX.viewport[2]-CTX.viewport[0], - CTX.viewport[3]-CTX.viewport[1]); - glViewport(CTX.viewport[0], CTX.viewport[1], - CTX.viewport[2], CTX.viewport[3]); + else{ + if((w() != CTX.viewport[2]-CTX.viewport[0]) || + (h() != CTX.viewport[3]-CTX.viewport[1])){ + WID->set_size(CTX.viewport[2]-CTX.viewport[0], + CTX.viewport[3]-CTX.viewport[1]); + glViewport(CTX.viewport[0], CTX.viewport[1], + CTX.viewport[2], CTX.viewport[3]); + } } + if(!ZOOM){ Orthogonalize(0,0); ClearOpengl();