Commit 0cb06741 authored by Thibault Soucarre's avatar Thibault Soucarre

some corrections for settings menu

parent bd3a3ba1
...@@ -794,6 +794,7 @@ void Settings_window::on_apply_clicked() { ...@@ -794,6 +794,7 @@ void Settings_window::on_apply_clicked() {
_links_visible_changes.clear(); _links_visible_changes.clear();
_color_cancel.clear(); _color_cancel.clear();
_visible_cancel.clear(); _visible_cancel.clear();
_c->launch_action(Core::_STATE_RENDER_UPDATE);
emit settings_changed(); // Catch by at least the interface_graphic which will dispatch it to the classes which needs emit settings_changed(); // Catch by at least the interface_graphic which will dispatch it to the classes which needs
//hide(); //hide();
} }
...@@ -827,7 +828,6 @@ void Settings_window::on_cancel_clicked() { ...@@ -827,7 +828,6 @@ void Settings_window::on_cancel_clicked() {
_color_cancel.clear(); _color_cancel.clear();
_visible_cancel.clear(); _visible_cancel.clear();
_reload = false; _reload = false;
hide();
} }
void Settings_window::on_ok_clicked(){ void Settings_window::on_ok_clicked(){
if( _changed ) if( _changed )
......
...@@ -437,7 +437,7 @@ void Render_alternate::paintGL(){ ...@@ -437,7 +437,7 @@ void Render_alternate::paintGL(){
const std::map<Element_pos,Element_pos>::const_iterator it_end = previous_by_column.end(); const std::map<Element_pos,Element_pos>::const_iterator it_end = previous_by_column.end();
if (it==it_end || render_to_screen_y(trace_to_render_y(_texts[i].y)) - render_to_screen_y(trace_to_render_y((*it).second))> height ){ if (it==it_end || render_to_screen_y(trace_to_render_y(_texts[i].y)) - render_to_screen_y(trace_to_render_y((*it).second))> height ){
const QString text_elided = metric.elidedText(_texts[i].value.c_str(), Qt::ElideRight, _x_scale_container_state*Info::Screen::width/(Info::Trace::depth+1.)); const QString text_elided = metric.elidedText(_texts[i].value.c_str(), Qt::ElideRight, 0.8 * _x_scale_container_state*Info::Screen::width/(Info::Trace::depth+1.));
renderText ( render_to_screen_x(_texts[i].x * _x_scale_container_state/0.20), renderText ( render_to_screen_x(_texts[i].x * _x_scale_container_state/0.20),
render_to_screen_y( trace_to_render_y(_texts[i].y) + 0.5), render_to_screen_y( trace_to_render_y(_texts[i].y) + 0.5),
text_elided, text_elided,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment