From 6b06262744a29ea7e31d3b00a2011e271659647a Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 24 Jan 2013 06:29:53 +0000
Subject: [PATCH] tweaks

---
 Fltk/FlGui.cpp          | 6 +++---
 Fltk/clippingWindow.cpp | 2 +-
 Fltk/onelabGroup.cpp    | 7 +++++--
 Fltk/optionWindow.cpp   | 2 +-
 Fltk/pluginWindow.cpp   | 6 +++---
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index 8e92bd367c..f093a227ac 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -96,9 +96,9 @@ FlGui::FlGui(int argc, char **argv)
   //Fl::set_color(FL_SELECTION_COLOR, 50, 50, 0);
 #endif
 
-  // add new box types used in graphic window
-  Fl::set_boxtype(GMSH_SIMPLE_RIGHT_BOX, simple_right_box_draw, 1, 1, 2, 2);
-  Fl::set_boxtype(GMSH_SIMPLE_TOP_BOX, simple_top_box_draw, 1, 1, 2, 2);
+  // add new box types used in graphic window (dx dy dw dh)
+  Fl::set_boxtype(GMSH_SIMPLE_RIGHT_BOX, simple_right_box_draw, 0, 0, 1, 0);
+  Fl::set_boxtype(GMSH_SIMPLE_TOP_BOX, simple_top_box_draw, 0, 1, 0, 0);
 
   // add global shortcuts
   Fl::add_handler(globalShortcut);
diff --git a/Fltk/clippingWindow.cpp b/Fltk/clippingWindow.cpp
index 98a7e5f5ae..346cac9539 100644
--- a/Fltk/clippingWindow.cpp
+++ b/Fltk/clippingWindow.cpp
@@ -197,7 +197,7 @@ clippingWindow::clippingWindow(int deltaFontSize)
 
   browser = new Fl_Multi_Browser(0, 0, L, height);
   browser->callback(clip_update_cb);
-  browser->box(FL_FLAT_BOX);
+  browser->box(GMSH_SIMPLE_RIGHT_BOX);
 
   Fl_Tabs *o = new Fl_Tabs
     (L + WB, WB, width - L - 2 * WB, height - 3 * WB - 4 * BH);
diff --git a/Fltk/onelabGroup.cpp b/Fltk/onelabGroup.cpp
index a22bd02534..bf175911d0 100644
--- a/Fltk/onelabGroup.cpp
+++ b/Fltk/onelabGroup.cpp
@@ -782,11 +782,14 @@ onelabGroup::onelabGroup(int x, int y, int w, int h, const char *l)
   _tree->color(col);
   _tree->callback(onelab_tree_cb);
   _tree->connectorstyle(FL_TREE_CONNECTOR_SOLID);
-  //_tree->connectorstyle(FL_TREE_CONNECTOR_NONE);
+  // _tree->marginleft(0);
+  // _tree->usericonmarginleft(0);
+  // _tree->labelmarginleft(0);
+  // _tree->connectorwidth(15);
   _tree->showroot(0);
   _tree->box(FL_FLAT_BOX);
   _tree->scrollbar_size(std::max(10, FL_NORMAL_SIZE - 2));
-  //_tree->resizable(0);
+  // _tree->resizable(0);
   _tree->end();
 
   _computeWidths();
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 916448db5a..b21eef003b 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -1294,7 +1294,7 @@ optionWindow::optionWindow(int deltaFontSize)
 
   // Selection browser
   browser = new Fl_Hold_Browser(0, 0, L, height);
-  browser->box(FL_FLAT_BOX);
+  browser->box(GMSH_SIMPLE_RIGHT_BOX);
   browser->has_scrollbar(Fl_Browser_::VERTICAL);
   browser->add("General");
   browser->add("Geometry");
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index 14996aef48..83c2b0d973 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -312,13 +312,13 @@ pluginWindow::pluginWindow(int deltaFontSize)
 
   browser = new Fl_Hold_Browser(0, 0, L1, height);
   browser->callback(plugin_browser_cb);
-  browser->box(FL_FLAT_BOX);
+  browser->box(GMSH_SIMPLE_RIGHT_BOX);
   browser->has_scrollbar(Fl_Browser_::VERTICAL);
 
-  view_browser = new Fl_Multi_Browser(L1 + 1, 0, L2 - 1, height);
+  view_browser = new Fl_Multi_Browser(L1, 0, L2, height);
   view_browser->has_scrollbar(Fl_Browser_::VERTICAL);
   view_browser->callback(plugin_browser_cb);
-  view_browser->box(FL_FLAT_BOX);
+  view_browser->box(GMSH_SIMPLE_RIGHT_BOX);
 
   for(std::map<std::string, GMSH_Plugin*>::iterator it = PluginManager::
         instance()->begin(); it != PluginManager::instance()->end(); ++it) {
-- 
GitLab