// if the tangent isn't split, then split it
if (!((*(parent_value_node->get_link("split")))(get_time()).get(bool())))
{
- get_canvas_view()->canvas_interface()->
+ if (get_canvas_view()->canvas_interface()->
change_value(synfigapp::ValueDesc(parent_value_node,
parent_value_node->get_link_index_from_name("split")),
- true);
- // rebuild the ducks from scratch, so the tangents ducks aren't connected
- get_canvas_view()->rebuild_ducks();
-
- // reprocess the mouse click
- return on_drawing_area_event(event);
+ true))
+ {
+ // rebuild the ducks from scratch, so the tangents ducks aren't connected
+ get_canvas_view()->rebuild_ducks();
+
+ // reprocess the mouse click
+ return on_drawing_area_event(event);
+ }
+ else
+ return true;
}
} else {
// I don't know how to access the vertex from the tangent duck when originally drawing the bline in the bline tool
drawing_frame->unset_bg(Gtk::STATE_NORMAL);
#endif
- previous_focus=get_focus_point();
-
return true;
}
void
studio::WorkArea::zoom_fit()
{
- // This really doesn't zoom to fit. Bug.
- zoom_norm();
+ float new_zoom(min(drawing_area->get_width() * zoom / w, drawing_area->get_height() * zoom / h));
+ if (zoom / new_zoom > 0.995 && new_zoom / zoom > 0.995)
+ {
+ set_zoom(prev_zoom);
+ return set_focus_point(previous_focus);
+ }
+ previous_focus = get_focus_point();
+ prev_zoom = zoom;
+ set_zoom(new_zoom);
+ set_focus_point(Point(0,0));
}
void
studio::WorkArea::zoom_norm()
{
- if(zoom==1.0)
- set_zoom(prev_zoom);
- else
- {
- prev_zoom=zoom;
- set_zoom(1.0f);
- }
+ if (zoom == 1.0) return set_zoom(prev_zoom);
+ prev_zoom = zoom;
+ set_zoom(1.0f);
}
gboolean