diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 71749234ea27ec51839129eae7dc7bdfc12cc03d..0fc99e2585ca1ccea0774e26318cac41e618c2a8 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -505,7 +505,7 @@ StringXNumber GeneralOptions_Number[] = {
"Maximum model coordinate along the Y-axis (read-only)" },
{ F, "MaxZ" , opt_general_zmax , 0. ,
"Maximum model coordinate along the Z-axis (read-only)" },
- { F|S, "MenuWidth" , opt_general_menu_size , 300. ,
+ { F|S, "MenuWidth" , opt_general_menu_size , 200. ,
"Width (in pixels) of the menu tree" },
{ F|S, "MessageHeight" , opt_general_message_size , 300. ,
"Height (in pixels) of the message console" },
diff --git a/Fltk/FlGui.h b/Fltk/FlGui.h
index 2edaf57891638504811f6e332cc8aab92c3b6b29..0fc2ea334dd05842a824912c493aed95e1f4d75f 100644
--- a/Fltk/FlGui.h
+++ b/Fltk/FlGui.h
@@ -10,13 +10,10 @@
#include <vector>
#define GMSH_WINDOW_BOX FL_FLAT_BOX
-#define NB_BUTT_SCROLL 25
-#define NB_HISTORY_MAX 1000
-#define NB_SOLVER_MAX 5
#define IW (10 * FL_NORMAL_SIZE) // input field width
#define BB (7 * FL_NORMAL_SIZE) // width of a button with internal label
#define BH (2 * FL_NORMAL_SIZE + 1) // button height
-#define WB (7) // window border
+#define WB (5) // window border
class graphicWindow;
class openglWindow;
diff --git a/Fltk/clippingWindow.cpp b/Fltk/clippingWindow.cpp
index f6a1b1d7565bdb4fb2f0bd78fd3e6f77c913c85f..546065bebe4bf3ee6497758413683fcfffd2faec 100644
--- a/Fltk/clippingWindow.cpp
+++ b/Fltk/clippingWindow.cpp
@@ -70,33 +70,33 @@ static void clip_update_cb(Fl_Widget *w, void *data)
FlGui::instance()->clipping->box[4]->value(),
FlGui::instance()->clipping->box[5]->value()};
// left
- CTX::instance()->clipPlane[0][0] = 1.;
+ CTX::instance()->clipPlane[0][0] = 1.;
CTX::instance()->clipPlane[0][1] = 0.;
CTX::instance()->clipPlane[0][2] = 0.;
CTX::instance()->clipPlane[0][3] = -c[0] + d[0] / 2.;
// top
- CTX::instance()->clipPlane[1][0] = 0.;
- CTX::instance()->clipPlane[1][1] = 1.;
+ CTX::instance()->clipPlane[1][0] = 0.;
+ CTX::instance()->clipPlane[1][1] = 1.;
CTX::instance()->clipPlane[1][2] = 0.;
CTX::instance()->clipPlane[1][3] = -c[1] + d[1] / 2.;
// near
- CTX::instance()->clipPlane[2][0] = 0.;
- CTX::instance()->clipPlane[2][1] = 0.;
+ CTX::instance()->clipPlane[2][0] = 0.;
+ CTX::instance()->clipPlane[2][1] = 0.;
CTX::instance()->clipPlane[2][2] = 1.;
CTX::instance()->clipPlane[2][3] = -c[2] + d[2] / 2.;
// right
- CTX::instance()->clipPlane[3][0] = -1.;
- CTX::instance()->clipPlane[3][1] = 0.;
+ CTX::instance()->clipPlane[3][0] = -1.;
+ CTX::instance()->clipPlane[3][1] = 0.;
CTX::instance()->clipPlane[3][2] = 0.;
CTX::instance()->clipPlane[3][3] = c[0] + d[0] / 2.;
// bottom
- CTX::instance()->clipPlane[4][0] = 0.;
- CTX::instance()->clipPlane[4][1] = -1.;
+ CTX::instance()->clipPlane[4][0] = 0.;
+ CTX::instance()->clipPlane[4][1] = -1.;
CTX::instance()->clipPlane[4][2] = 0.;
CTX::instance()->clipPlane[4][3] = c[1] + d[1] / 2.;
// far
- CTX::instance()->clipPlane[5][0] = 0.;
- CTX::instance()->clipPlane[5][1] = 0.;
+ CTX::instance()->clipPlane[5][0] = 0.;
+ CTX::instance()->clipPlane[5][1] = 0.;
CTX::instance()->clipPlane[5][2] = -1.;
CTX::instance()->clipPlane[5][3] = c[2] + d[2] / 2.;
@@ -104,9 +104,9 @@ static void clip_update_cb(Fl_Widget *w, void *data)
for(int j = 0; j < 4; j++)
FlGui::instance()->clipping->plane[j]->value(CTX::instance()->clipPlane[idx][j]);
}
-
- if(CTX::instance()->clipWholeElements ||
- CTX::instance()->clipWholeElements !=
+
+ if(CTX::instance()->clipWholeElements ||
+ CTX::instance()->clipWholeElements !=
FlGui::instance()->clipping->butt[0]->value()){
for(int clip = 0; clip < 6; clip++){
if(CTX::instance()->mesh.clip)
@@ -116,14 +116,14 @@ static void clip_update_cb(Fl_Widget *w, void *data)
PView::list[index]->setChanged(true);
}
}
-
- CTX::instance()->clipWholeElements =
+
+ CTX::instance()->clipWholeElements =
FlGui::instance()->clipping->butt[0]->value();
- CTX::instance()->clipOnlyDrawIntersectingVolume =
+ CTX::instance()->clipOnlyDrawIntersectingVolume =
FlGui::instance()->clipping->butt[1]->value();
- CTX::instance()->clipOnlyVolume =
+ CTX::instance()->clipOnlyVolume =
FlGui::instance()->clipping->butt[2]->value();
-
+
int old = CTX::instance()->drawBBox;
CTX::instance()->drawBBox = 1;
if(CTX::instance()->fastRedraw)
@@ -195,8 +195,9 @@ clippingWindow::clippingWindow(int deltaFontSize)
(width, height, CTX::instance()->nonModalWindows ? true : false, "Clipping");
win->box(GMSH_WINDOW_BOX);
- browser = new Fl_Multi_Browser(WB, WB, L - WB, height - BH - 3 * WB);
+ browser = new Fl_Multi_Browser(0, 0, L, height);
browser->callback(clip_update_cb);
+ browser->box(FL_FLAT_BOX);
Fl_Tabs *o = new Fl_Tabs
(L + WB, WB, width - L - 2 * WB, height - 3 * WB - 4 * BH);
@@ -212,9 +213,10 @@ clippingWindow::clippingWindow(int deltaFontSize)
Fl_Button *invert = new Fl_Button
(L + 2 * WB, 2 * WB + 2 * BH, FL_NORMAL_SIZE, 4 * BH, "-");
+ invert->box(FL_THIN_UP_BOX);
invert->callback(clip_invert_cb);
invert->tooltip("Invert orientation");
-
+
plane[0] = new Fl_Value_Input
(L + 2 * WB + FL_NORMAL_SIZE, 2 * WB + 2 * BH, BW - FL_NORMAL_SIZE, BH, "A");
plane[1] = new Fl_Value_Input
@@ -300,7 +302,7 @@ void clippingWindow::resetBrowser()
for(int i = 0; i < browser->size(); i++){
if((i == 0 && CTX::instance()->geom.clip & (1 << idx)) ||
(i == 1 && CTX::instance()->mesh.clip & (1 << idx)) ||
- (i > 1 && i - 2 < (int)PView::list.size() &&
+ (i > 1 && i - 2 < (int)PView::list.size() &&
PView::list[i - 2]->getOptions()->clip & (1 << idx)))
browser->select(i + 1);
}
@@ -315,7 +317,7 @@ void clippingWindow::resetBrowser()
}
double val1 = 0;
for(int i = 0; i < 3; i++)
- val1 = std::max(val1, std::max(fabs(CTX::instance()->min[i]),
+ val1 = std::max(val1, std::max(fabs(CTX::instance()->min[i]),
fabs(CTX::instance()->max[i])));
val1 *= 1.5;
@@ -324,14 +326,14 @@ void clippingWindow::resetBrowser()
plane[3]->maximum(val1);
fillBoxValuesFromPlaneValues();
-
+
for(int i = 0; i < 6; i++){
box[i]->step(val1 / 200.);
box[i]->minimum(-val1);
box[i]->maximum(val1);
}
}
-
+
void clippingWindow::fillBoxValuesFromPlaneValues()
{
double c[3] = {(-CTX::instance()->clipPlane[0][3] + CTX::instance()->clipPlane[3][3]) / 2.,
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 34155a30238bd6d21132acbe56bbb176b7ab2d8a..645f40bf874a1ca42bda1c8485c6b3005307c683 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -1301,7 +1301,8 @@ optionWindow::optionWindow(int deltaFontSize)
win->label("Options - General");
// Selection browser
- browser = new Fl_Hold_Browser(WB, WB, L - WB, height - 2 * WB);
+ browser = new Fl_Hold_Browser(0, 0, L, height);
+ browser->box(FL_FLAT_BOX);
browser->has_scrollbar(Fl_Browser_::VERTICAL);
browser->add("General");
browser->add("Geometry");
@@ -3670,13 +3671,13 @@ void optionWindow::activate(const char *what)
if(!strcmp(what, "fast_redraw")){
if(general.butt[2]->value()){
browser->resize(browser->x(), browser->y(), browser->w(),
- win->h() - 3 * WB - BH);
+ win->h() - 2 * WB - BH);
redraw->show();
win->redraw();
}
else{
browser->resize(browser->x(), browser->y(), browser->w(),
- win->h() - 2 * WB);
+ win->h());
redraw->hide();
win->redraw();
}
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index bf4eb88226968f74e1991a2eb9686eadda5224b4..b45d8abcd399230190e53685e0e2b3fdc8490cde 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -318,27 +318,31 @@ pluginWindow::pluginWindow(int deltaFontSize)
int width0 = 34 * FL_NORMAL_SIZE + WB;
int height0 = 12 * BH + 4 * WB;
- int L1 = 10 * FL_NORMAL_SIZE, L2 = 6 * FL_NORMAL_SIZE;
+ int L1 = 13 * FL_NORMAL_SIZE, L2 = 6 * FL_NORMAL_SIZE;
- int width = (CTX::instance()->pluginSize[0] < width0) ? width0 :
+ int width = (CTX::instance()->pluginSize[0] < width0) ? width0 :
CTX::instance()->pluginSize[0];
- int height = (CTX::instance()->pluginSize[1] < height0) ? height0 :
+ int height = (CTX::instance()->pluginSize[1] < height0) ? height0 :
CTX::instance()->pluginSize[1];
win = new paletteWindow
(width, height, CTX::instance()->nonModalWindows ? true : false, "Plugins");
win->box(GMSH_WINDOW_BOX);
- browser = new Fl_Hold_Browser(WB, WB, L1, height - 2 * WB);
+ browser = new Fl_Hold_Browser(0, 0, L1, height);
browser->callback(plugin_browser_cb);
+ browser->box(FL_FLAT_BOX);
+ browser->has_scrollbar(Fl_Browser_::VERTICAL);
- view_browser = new Fl_Multi_Browser(WB + L1, WB, L2, height - 2 * WB - BH);
+ view_browser = new Fl_Multi_Browser(L1, 0, L2, height - BH);
view_browser->has_scrollbar(Fl_Browser_::VERTICAL);
view_browser->callback(plugin_browser_cb);
+ view_browser->box(FL_FLAT_BOX);
- Fl_Button *b = new Fl_Button(WB + L1, height - WB - BH, L2, BH, "New view");
+ Fl_Button *b = new Fl_Button(L1, height - BH, L2, BH, "New view");
b->callback(plugin_create_new_view_cb);
b->tooltip("Create new post-processing dataset based on current mesh");
+ b->box(FL_FLAT_BOX);
for(std::map<std::string, GMSH_Plugin*>::iterator it = PluginManager::
instance()->begin(); it != PluginManager::instance()->end(); ++it) {
@@ -346,7 +350,7 @@ pluginWindow::pluginWindow(int deltaFontSize)
if(p->getType() == GMSH_Plugin::GMSH_POST_PLUGIN ||
p->getType() == GMSH_Plugin::GMSH_MESH_PLUGIN) {
browser->add(p->getName().c_str(), p);
- _createDialogBox(p, 2 * WB + L1 + L2, WB, width - L1 - L2 - 3 * WB,
+ _createDialogBox(p, L1 + L2 + WB, WB, width - L1 - L2 - 2 * WB,
height - 2 * WB);
// select first plugin by default
if(it == PluginManager::instance()->begin()){
@@ -357,10 +361,10 @@ pluginWindow::pluginWindow(int deltaFontSize)
}
record = new Fl_Check_Button
- (L1 + L2 + 3 * WB, height - BH - 2 * WB, BB, BH, "Record");
+ (L1 + L2 + 2 * WB, height - BH - 2 * WB, BB, BH, "Record");
record->type(FL_TOGGLE_BUTTON);
record->tooltip("Append scripting command to file options when plugin is run");
-
+
win->resizable(new Fl_Box(L1 + L2 + 2 * BH, height - 4 * BH, 10, 10));
win->size_range(width0, height0);
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 39283851f3426372ab49d76ed66c2076a9d0f0cf..646abb165b295f7be21ea548981d7785479c56b9 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -1142,29 +1142,34 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
Fl_Button *o0 = new Fl_Button
(2 * WB, 2 * WB + BH, cols[0], BH/2, "*");
+ o0->box(FL_THIN_UP_BOX);
o0->align(FL_ALIGN_TOP | FL_ALIGN_INSIDE);
o0->tooltip("Select/unselect all");
o0->callback(visibility_sort_cb, (void *)"*");
Fl_Button *o1 = new Fl_Button
(2 * WB, 2 * WB + BH + BH/2, cols[0], BH - BH/2, "-");
+ o1->box(FL_THIN_UP_BOX);
o1->tooltip("Invert selection");
o1->callback(visibility_sort_cb, (void *)"-");
Fl_Button *o2 = new Fl_Button
(2 * WB + cols[0], 2 * WB + BH, cols[1], BH, "Type");
+ o2->box(FL_THIN_UP_BOX);
o2->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE);
o2->tooltip("Sort by type");
o2->callback(visibility_sort_cb, (void *)"type");
Fl_Button *o3 = new Fl_Button
(2 * WB + cols[0] + cols[1], 2 * WB + BH, cols[2], BH, "Number");
+ o3->box(FL_THIN_UP_BOX);
o3->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE);
o3->tooltip("Sort by number");
o3->callback(visibility_sort_cb, (void *)"number");
Fl_Button *o4 = new Fl_Button
(2 * WB + cols[0] + cols[1] + cols[2], 2 * WB + BH, cols[3], BH, "Name");
+ o4->box(FL_THIN_UP_BOX);
o4->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE);
o4->tooltip("Sort by name");
o4->callback(visibility_sort_cb, (void *)"name");
@@ -1173,6 +1178,7 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
Fl_Button *o5 = new Fl_Button
(width - 4 * WB, 2 * WB + BH, 2 * WB, BH, "+");
+ o5->box(FL_THIN_UP_BOX);
o5->tooltip("Add parameter name for first selected item");
o5->callback(visibility_sort_cb, (void *)"+");
@@ -1403,7 +1409,7 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
win->size_range(width, 15 * BH + 5 * WB);
{
- int aw = 5 * WB;
+ int aw = (int)(2.5 * FL_NORMAL_SIZE);
int ww = (width - 5 * WB - aw) / 4;
Fl_Group *g = new Fl_Group(WB, height - BH - WB, width - 2 * WB - 2 * ww, BH);