diff --git a/CMakeLists.txt b/CMakeLists.txt index ff57b145fac6fc5d07de15401acb722bbe5b97b6..de5f29e34a6fa86898c48d35dbe25fb3a5bfb7cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1164,7 +1164,7 @@ if(MAKEINFO) ARGS ${TEX_DIR}/gmsh.texi WORKING_DIRECTORY ${TEX_DIR}) add_custom_target(txt DEPENDS ${TEX_DIR}/gmsh.txt) add_custom_command(OUTPUT ${TEX_DIR}/gmsh.html DEPENDS ${TEX_SRC} - COMMAND ${MAKEINFO} --html --no-split + COMMAND ${MAKEINFO} --html --css-ref=http://geuz.org/geuz.css --no-split ARGS ${TEX_DIR}/gmsh.texi WORKING_DIRECTORY ${TEX_DIR}) add_custom_target(html DEPENDS ${TEX_DIR}/gmsh.html) install(FILES ${TEX_DIR}/gmsh.html DESTINATION ${GMSH_DOC} OPTIONAL) diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp index 945c7d178fa1e96887fe6b46e93273754164895b..5ba8703367e2cba1a5ea87210b5cf3d9899303d5 100644 --- a/Fltk/onelabWindow.cpp +++ b/Fltk/onelabWindow.cpp @@ -1091,7 +1091,7 @@ void onelabWindow::rebuildTree() { FL_NORMAL_SIZE -= _deltaFontSize; - _itemWidth = (int)(0.5 * _tree->w()); + _itemWidth = (int)(0.45 * _tree->w()); std::vector<std::string> closed; for (Fl_Tree_Item *n = _tree->first(); n; n = n->next()) diff --git a/Geo/GFaceCompound.h b/Geo/GFaceCompound.h index fc853688d2e1e3cea1362c9f677fbbe611a12e67..dad482fd9c72de3075a2a9e3f766bd82a98cc1cc 100644 --- a/Geo/GFaceCompound.h +++ b/Geo/GFaceCompound.h @@ -199,20 +199,20 @@ class GFaceCompound : public GFace { CONVEX_CIRCLE=4,CONVEX_PLANE=5, HARMONIC_SQUARE=6, CONFORMAL_FE=7} typeOfCompound; typedef enum {HARMONIC=0,CONFORMAL=1, RBF=2, CONVEX=3} typeOfMapping; typedef enum {UNITCIRCLE, MEANPLANE, SQUARE, ALREADYFIXED,SPECTRAL, FE} typeOfIsomorphism; - GFaceCompound(GModel *m, int tag, std::list<GFace*> &compound, - std::list<GEdge*> &U0, typeOfMapping typ = HARMONIC, - int allowPartition=1, - linearSystem<double>* lsys =0) + GFaceCompound(GModel *m, int tag, std::list<GFace*> &compound, + std::list<GEdge*> &U0, typeOfMapping typ = HARMONIC, + int allowPartition=1, + linearSystem<double>* lsys =0) : GFace(m, tag) { Msg::Error("Gmsh has to be compiled with solver support to use GFaceCompounds"); } - GFaceCompound(GModel *m, int tag, std::list<GFace*> &compound, - std::list<GEdge*> &U0, std::list<GEdge*> &V0, - std::list<GEdge*> &U1, std::list<GEdge*> &V1, - typeOfCompound typ = HARMONIC_CIRCLE, - int allowPartition=1, - linearSystem<double>* lsys =0) + GFaceCompound(GModel *m, int tag, std::list<GFace*> &compound, + std::list<GEdge*> &U0, std::list<GEdge*> &V0, + std::list<GEdge*> &U1, std::list<GEdge*> &V1, + typeOfCompound typ = HARMONIC_CIRCLE, + int allowPartition=1, + linearSystem<double>* lsys =0) : GFace(m, tag) { Msg::Error("Gmsh has to be compiled with solver support to use GFaceCompounds");