From 4f196fa9fc6b77f97bb72effb9fc122b818040cb Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sat, 10 May 2014 20:40:01 +0000 Subject: [PATCH] pp --- Fltk/optionWindow.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp index 9afebed98c..1e56d42fd4 100644 --- a/Fltk/optionWindow.cpp +++ b/Fltk/optionWindow.cpp @@ -374,10 +374,10 @@ static void general_options_ok_cb(Fl_Widget *w, void *data) opt_general_camera_aperture(0, GMSH_SET, o->general.value[31]->value()); if(opt_general_stereo_mode(0, GMSH_GET, 0) != o->general.butt[17]->value()) { opt_general_stereo_mode(0, GMSH_SET, o->general.butt[17]->value()); - for(unsigned int i = 0; i < FlGui::instance()->graph.size(); i++) FlGui::instance()->graph[i]->setStereo((bool)CTX::instance()->stereo); + for(unsigned int i = 0; i < FlGui::instance()->graph.size(); i++) + FlGui::instance()->graph[i]->setStereo((bool)CTX::instance()->stereo); } - if(CTX::instance()->fastRedraw) CTX::instance()->post.draw = CTX::instance()->mesh.draw = 0; drawContext::global()->draw(); @@ -528,7 +528,8 @@ static void mesh_options_ok_cb(Fl_Widget *w, void *data) opt_mesh_angle_smooth_normals(0, GMSH_SET, o->mesh.value[18]->value()); opt_mesh_recombine3d_all(0, GMSH_SET, o->mesh.butt[22]->value()); - opt_mesh_point_type(0, GMSH_SET, o->mesh.choice[0]->value()); opt_mesh_algo2d(0, GMSH_SET, + opt_mesh_point_type(0, GMSH_SET, o->mesh.choice[0]->value()); + opt_mesh_algo2d(0, GMSH_SET, (o->mesh.choice[2]->value() == 1) ? ALGO_2D_MESHADAPT : (o->mesh.choice[2]->value() == 2) ? ALGO_2D_DELAUNAY : (o->mesh.choice[2]->value() == 3) ? ALGO_2D_FRONTAL : @@ -3862,7 +3863,8 @@ void optionWindow::activate(const char *what) } else if(!strcmp(what, "general_camera")){ if(general.butt[19]->value()){ - if(CTX::instance()->gamepad && CTX::instance()->gamepad->active ) general.gamepadconfig->activate(); + if(CTX::instance()->gamepad && CTX::instance()->gamepad->active) + general.gamepadconfig->activate(); } else{ general.gamepadconfig->deactivate(); -- GitLab