From 111f0b1d8a91613f7029a82565290e56eeb1153f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 26 Jan 2016 13:03:57 +0000
Subject: [PATCH] slightly larger windows for linux font problems
---
Fltk/clippingWindow.cpp | 2 +-
Fltk/optionWindow.cpp | 5 +++--
Fltk/pluginWindow.cpp | 2 +-
Fltk/visibilityWindow.cpp | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Fltk/clippingWindow.cpp b/Fltk/clippingWindow.cpp
index ed435f023b..4769e6c367 100644
--- a/Fltk/clippingWindow.cpp
+++ b/Fltk/clippingWindow.cpp
@@ -260,7 +260,7 @@ clippingWindow::clippingWindow(int deltaFontSize)
butt[0] = new Fl_Check_Button
(L + WB, 3 * WB + 6 * BH, width - L - 2 * WB, BH, "Keep whole elements");
butt[1] = new Fl_Check_Button
- (L + WB, 3 * WB + 7 * BH, width - L - 2 * WB, BH, "Only draw intersecting volume layer");
+ (L + WB, 3 * WB + 7 * BH, width - L - 2 * WB, BH, "Only draw volume layer");
butt[2] = new Fl_Check_Button
(L + WB, 3 * WB + 8 * BH, width - L - 2 * WB, BH, "Cut only volume elements");
for(int i = 0; i < 3; i++){
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index bb89a10674..b191dd4ca1 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -1327,7 +1327,7 @@ optionWindow::optionWindow(int deltaFontSize)
{
FL_NORMAL_SIZE -= deltaFontSize;
- int width = 34 * FL_NORMAL_SIZE + WB;
+ int width = 37 * FL_NORMAL_SIZE + WB;
int height = 12 * BH + 4 * WB;
int L = 7 * FL_NORMAL_SIZE;
@@ -1822,6 +1822,7 @@ optionWindow::optionWindow(int deltaFontSize)
while(GeneralOptions_Color[i].str) {
general.color[i] = new Fl_Button
(L + 2 * WB, 3 * WB + (6 + i) * BH, IW, BH, GeneralOptions_Color[i].str);
+ general.color[i]->align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
general.color[i]->callback(color_cb, (void *)GeneralOptions_Color[i].function);
i++;
}
@@ -2347,7 +2348,7 @@ optionWindow::optionWindow(int deltaFontSize)
mesh.value[3]->callback(mesh_options_ok_cb);
mesh.butt[4] = new Fl_Check_Button
- (L + 2 * WB + IW + WB / 2, 2 * WB + 11 * BH, BW, BH, "Use incomplete elements");
+ (L + 2 * WB + 1.25 * IW, 2 * WB + 11 * BH, BW, BH, "Use incomplete elements");
mesh.butt[4]->type(FL_TOGGLE_BUTTON);
mesh.butt[4]->callback(mesh_options_ok_cb);
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index 910c7d9adf..c0d4779cc1 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -298,7 +298,7 @@ pluginWindow::pluginWindow(int deltaFontSize)
{
FL_NORMAL_SIZE -= deltaFontSize;
- int width0 = 34 * FL_NORMAL_SIZE + WB;
+ int width0 = 37 * FL_NORMAL_SIZE + WB;
int height0 = 12 * BH + 4 * WB;
int L1 = 13 * FL_NORMAL_SIZE, L2 = 6 * FL_NORMAL_SIZE;
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 2aff31dda8..23ed0e807c 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -1146,7 +1146,7 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
{
FL_NORMAL_SIZE -= deltaFontSize;
- int CC = (int)(1.1 * BB);
+ int CC = (int)(1.18 * BB);
static int cols[5] = {3 * WB, CC, CC, 2 * CC, 0};
int width = cols[0] + cols[1] + cols[2] + cols[3] + 7 * WB;
--
GitLab