diff --git a/Common/Options.cpp b/Common/Options.cpp index 011377d2c5b8eb15dc9769d285a3c8a4538d0e8b..9f7ccdaab3a88abc658f689fd4c19c9409e8e40a 100644 --- a/Common/Options.cpp +++ b/Common/Options.cpp @@ -10092,7 +10092,7 @@ unsigned int opt_view_color_text2d(OPT_ARGS_COL) } #if defined(HAVE_FLTK) if(_gui_action_valid(action, num)){ - CCC(opt->color.text2d, FlGui::instance()->options->view.color[10]); + CCC(opt->color.text2d, FlGui::instance()->options->view.color[11]); drawContext::global()->resetFontTextures(); } #endif @@ -10111,7 +10111,7 @@ unsigned int opt_view_color_text3d(OPT_ARGS_COL) } #if defined(HAVE_FLTK) if(_gui_action_valid(action, num)){ - CCC(opt->color.text3d, FlGui::instance()->options->view.color[11]); + CCC(opt->color.text3d, FlGui::instance()->options->view.color[12]); drawContext::global()->resetFontTextures(); } #endif @@ -10130,7 +10130,7 @@ unsigned int opt_view_color_axes(OPT_ARGS_COL) } #if defined(HAVE_FLTK) if(_gui_action_valid(action, num)){ - CCC(opt->color.axes, FlGui::instance()->options->view.color[12]); + CCC(opt->color.axes, FlGui::instance()->options->view.color[13]); drawContext::global()->resetFontTextures(); } #endif @@ -10149,7 +10149,7 @@ unsigned int opt_view_color_background2d(OPT_ARGS_COL) } #if defined(HAVE_FLTK) if(_gui_action_valid(action, num)){ - CCC(opt->color.background2d, FlGui::instance()->options->view.color[13]); + CCC(opt->color.background2d, FlGui::instance()->options->view.color[14]); drawContext::global()->resetFontTextures(); } #endif diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp index f66bedca4f2130aa63b6d492547af777a0872e5f..54e3658c840908e4d9fcdaeab6279caca6db0d6c 100644 --- a/Fltk/optionWindow.cpp +++ b/Fltk/optionWindow.cpp @@ -1276,6 +1276,8 @@ static void view_options_ok_cb(Fl_Widget *w, void *data) opt_view_color_prisms(current, GMSH_GET, 0)); opt_view_color_pyramids(i, GMSH_SET, opt_view_color_pyramids(current, GMSH_GET, 0)); + opt_view_color_trihedra(i, GMSH_SET, + opt_view_color_trihedra(current, GMSH_GET, 0)); opt_view_color_tangents(i, GMSH_SET, opt_view_color_tangents(current, GMSH_GET, 0)); opt_view_color_normals(i, GMSH_SET, @@ -1286,6 +1288,8 @@ static void view_options_ok_cb(Fl_Widget *w, void *data) opt_view_color_text3d(current, GMSH_GET, 0)); opt_view_color_axes(i, GMSH_SET, opt_view_color_axes(current, GMSH_GET, 0)); + opt_view_color_background2d(i, GMSH_SET, + opt_view_color_background2d(current, GMSH_GET, 0)); } // colorbar window @@ -3867,6 +3871,7 @@ void optionWindow::updateViewGroup(int index) opt_view_color_text2d(index, GMSH_GUI, 0); opt_view_color_text3d(index, GMSH_GUI, 0); opt_view_color_axes(index, GMSH_GUI, 0); + opt_view_color_background2d(index, GMSH_GUI, 0); view.colorbar->update(data->getName().c_str(), data->getMin(), data->getMax(), &opt->colorTable, &v->getChanged());