Mercurial > octave-nkf
changeset 19792:a5206dfbaa13
rename mouse_wheel_zoom axes property to mousewheelzoom
* graphics.in.h: Rename mouse_wheel_zoom axes property to
mousewheelzoom.
* __init_fltk__.cc: Adapt to property name change.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 19 Feb 2015 01:26:52 -0500 |
| parents | 3266c382b328 |
| children | ed1bafbb87ee |
| files | libinterp/corefcn/graphics.in.h libinterp/dldfcn/__init_fltk__.cc |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.in.h Thu Feb 19 00:46:19 2015 -0500 +++ b/libinterp/corefcn/graphics.in.h Thu Feb 19 01:26:52 2015 -0500 @@ -3894,7 +3894,7 @@ any_property linestyleorder S , "-" double_property linewidth , 0.5 radio_property minorgridlinestyle , "-|--|{:}|-.|none" - double_property mouse_wheel_zoom , 0.05 + double_property mousewheelzoom , 0.5 radio_property nextplot , "add|replacechildren|{replace}" array_property outerposition u , default_axes_outerposition () array_property plotboxaspectratio mu , Matrix (1, 3, 1.0)
--- a/libinterp/dldfcn/__init_fltk__.cc Thu Feb 19 00:46:19 2015 -0500 +++ b/libinterp/dldfcn/__init_fltk__.cc Thu Feb 19 01:26:52 2015 -0500 @@ -1583,12 +1583,12 @@ dynamic_cast<axes::properties&> (ax.get_properties ()); // Control how fast to zoom when using scroll wheel. - double Vwheel_zoom_speed = ap.get_mouse_wheel_zoom (); + double wheel_zoom_speed = ap.get_mousewheelzoom (); // Determine if we're zooming in or out. const double factor = - (Fl::event_dy () > 0) ? 1 / (1.0 - Vwheel_zoom_speed) - : 1.0 - Vwheel_zoom_speed; + (Fl::event_dy () > 0) ? 1 / (1.0 - wheel_zoom_speed) + : 1.0 - wheel_zoom_speed; // Get the point we're zooming about. double x1, y1;