From fbc17ef2630f8d6240f07ba884ba2f74f5e0ee1f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 22 Jun 2015 20:24:00 +0000
Subject: [PATCH] uniformize scrollbars
---
Fltk/clippingWindow.cpp | 1 +
Fltk/helpWindow.cpp | 1 +
Fltk/optionWindow.cpp | 1 +
Fltk/pluginWindow.cpp | 3 ++-
Fltk/visibilityWindow.cpp | 3 +++
5 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Fltk/clippingWindow.cpp b/Fltk/clippingWindow.cpp
index 273cbb6f2e..58da0ab4b9 100644
--- a/Fltk/clippingWindow.cpp
+++ b/Fltk/clippingWindow.cpp
@@ -199,6 +199,7 @@ clippingWindow::clippingWindow(int deltaFontSize)
browser = new Fl_Multi_Browser(0, 0, L, height);
browser->callback(clip_update_cb);
browser->box(GMSH_SIMPLE_RIGHT_BOX);
+ browser->scrollbar_size(std::max(10, FL_NORMAL_SIZE - 2)); // thinner scrollbars
Fl_Tabs *o = new Fl_Tabs
(L + WB, WB, width - L - 2 * WB, height - 3 * WB - 4 * BH);
diff --git a/Fltk/helpWindow.cpp b/Fltk/helpWindow.cpp
index b5752e8863..5b0475af94 100644
--- a/Fltk/helpWindow.cpp
+++ b/Fltk/helpWindow.cpp
@@ -441,6 +441,7 @@ helpWindow::helpWindow()
browser->type(FL_MULTI_BROWSER);
browser->callback(browser_cb);
browser->tooltip("Double-click to edit value");
+ browser->scrollbar_size(std::max(10, FL_NORMAL_SIZE - 2)); // thinner scrollbars
options->resizable(browser);
options->position(Fl::x() + Fl::w()/2 - width / 2,
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index f7b1d11d7d..dbf7ae25cd 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -1339,6 +1339,7 @@ optionWindow::optionWindow(int deltaFontSize)
browser = new Fl_Multi_Browser(0, 0, L, height);
browser->box(GMSH_SIMPLE_RIGHT_BOX);
browser->has_scrollbar(Fl_Browser_::VERTICAL);
+ browser->scrollbar_size(std::max(10, FL_NORMAL_SIZE - 2)); // thinner scrollbars
browser->add("General");
browser->add("Geometry");
browser->add("Mesh");
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index 9fdc50b2ea..15a2b9f302 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -315,9 +315,11 @@ pluginWindow::pluginWindow(int deltaFontSize)
browser->callback(plugin_browser_cb);
browser->box(GMSH_SIMPLE_RIGHT_BOX);
browser->has_scrollbar(Fl_Browser_::VERTICAL);
+ browser->scrollbar_size(std::max(10, FL_NORMAL_SIZE - 2)); // thinner scrollbars
view_browser = new Fl_Multi_Browser(L1, 0, L2, height);
view_browser->has_scrollbar(Fl_Browser_::VERTICAL);
+ view_browser->scrollbar_size(std::max(10, FL_NORMAL_SIZE - 2)); // thinner scrollbars
view_browser->callback(plugin_browser_cb);
view_browser->box(GMSH_SIMPLE_RIGHT_BOX);
@@ -394,4 +396,3 @@ void pluginWindow::resetViewBrowser()
plugin_browser_cb(NULL, NULL);
}
-
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 8201a6dd8f..0ebe3abd32 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -1220,6 +1220,7 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
browser->type(FL_MULTI_BROWSER);
browser->textsize(FL_NORMAL_SIZE - 1);
browser->column_widths(cols);
+ browser->scrollbar_size(std::max(10, FL_NORMAL_SIZE - 2)); // thinner scrollbars
gg->end();
Fl_Group::current()->resizable(gg);
@@ -1259,6 +1260,7 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
tree->labelsize(FL_NORMAL_SIZE - 1);
tree->selectmode(FL_TREE_SELECT_MULTI);
tree->connectorstyle(FL_TREE_CONNECTOR_SOLID);
+ tree->scrollbar_size(std::max(10, FL_NORMAL_SIZE - 2)); // thinner scrollbars
tree->hide();
tree_create = new Fl_Button
@@ -1426,6 +1428,7 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
per_window = new Fl_Multi_Browser
(2 * WB, 2 * WB + BH, brw, height - 6 * WB - 3 * BH);
per_window->callback(visibility_per_window_cb, (void*)"item");
+ per_window->scrollbar_size(std::max(10, FL_NORMAL_SIZE - 2)); // thinner scrollbars
Fl_Button *b1 = new Fl_Button
(width - 1 * CC - 2 * WB, height - 2 * BH - 3 * WB, CC, BH, "Reset all");
--
GitLab