From 7ab77427610cf6500e7159324fcaa571618fc02e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 1 Jul 2006 10:35:49 +0000
Subject: [PATCH] Changed default font sizes to 13/16 (fltk/opengl). On recent
monitors with huge resolutions, 12/14 is really small
---
Common/DefaultOptions.h | 4 ++--
Fltk/GUI.cpp | 6 +++++-
Graphics/Entity.cpp | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 525f525e6e..825245ee60 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -561,10 +561,10 @@ StringXNumber GeneralOptions_Number[] = {
"Horizontal position (in pixels) of the upper left corner of the file chooser windows" },
{ F|S, "FileChooserPositionY" , opt_general_file_chooser_position1 , 200. ,
"Vertical position (in pixels) of the upper left corner of the file chooser windows" },
- { F|O, "FontSize" , opt_general_fontsize , 12. ,
+ { F|O, "FontSize" , opt_general_fontsize , 13. ,
"Size of the font in the user interface" },
- { F|O, "GraphicsFontSize" , opt_general_graphics_fontsize , 14. ,
+ { F|O, "GraphicsFontSize" , opt_general_graphics_fontsize , 16. ,
"Size of the font in the graphic window" },
{ F|S, "GraphicsHeight" , opt_general_viewport3 , 600. ,
"Height (in pixels) of the graphic window" },
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index e0ac34cd5f..4acd7deec0 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.501 2006-05-13 22:03:17 geuzaine Exp $
+// $Id: GUI.cpp,v 1.502 2006-07-01 10:35:48 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -1070,6 +1070,10 @@ void GUI::create_menu_window()
m_window->size(width, MH);
m_window->position(CTX.position[0], CTX.position[1]);
+
+ // force always on on top
+ //m_window->set_non_modal();
+
m_window->end();
}
diff --git a/Graphics/Entity.cpp b/Graphics/Entity.cpp
index ea66a549f8..dfde4dcb4f 100644
--- a/Graphics/Entity.cpp
+++ b/Graphics/Entity.cpp
@@ -1,4 +1,4 @@
-// $Id: Entity.cpp,v 1.63 2006-01-20 00:29:59 geuzaine Exp $
+// $Id: Entity.cpp,v 1.64 2006-07-01 10:35:49 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -532,7 +532,7 @@ void Draw_PlaneInBoundingBox(double xmin, double ymin, double zmin,
void Draw_SmallAxes()
{
double l = CTX.small_axes_size;
- double o = 2;
+ double o = CTX.gl_fontsize / 5;
double cx = CTX.small_axes_pos[0];
double cy = CTX.small_axes_pos[1];
--
GitLab