From 60f1a5650d7ecb3b73c9da6b143cff3aa59a4de5 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 26 Aug 2002 17:41:32 +0000
Subject: [PATCH] again, try to fix the resize problem
---
Fltk/GUI.cpp | 5 ++---
Fltk/Opengl_Window.cpp | 17 ++++++++++-------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index cc1aaa72b2..e5b75d380a 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 ed8489bb75..c846860a9d 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();
--
GitLab