add 1:1 convert, add es.po: thx sergio, cwdw zoom tweak, add done beep pots, bd forma...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / cwindowgui.C

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 1266f241653cc662e1e792d0297656977a30c807..fb0cdd6788300fbd08c7b8a73ee31d8418fb247d 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -3085,7 +3085,9 @@ int CWindowCanvas::test_zoom(int &redraw)
                        if( EQUIV(zoom, my_zoom_table[idx]) ) continue;
                        if( zoom < my_zoom_table[idx] ) break;
                }
-               zoom = idx < total_zooms ? my_zoom_table[idx] : 1.1 * zoom;
+               float zoom11 = 1.1f * zoom;
+               zoom = idx < total_zooms ? my_zoom_table[idx] : zoom11;
+               if( zoom > zoom11 ) zoom = zoom11;
                break; }
        case WHEEL_DOWN: {
                int idx = total_zooms;
@@ -3093,7 +3095,9 @@ int CWindowCanvas::test_zoom(int &redraw)
                        if( EQUIV(my_zoom_table[idx], zoom) ) continue;
                        if( my_zoom_table[idx] < zoom ) break;
                }
-               zoom = idx >= 0 ? my_zoom_table[idx] : 0.9 * zoom;
+               float zoom09 = 0.9f * zoom;
+               zoom = idx >= 0 ? my_zoom_table[idx] : zoom09;
+               if( zoom < zoom09 ) zoom = zoom09;
                break; }
        case MIDDLE_BUTTON:
                if( gui->shift_down() ) {
@@ -3259,7 +3263,7 @@ int CWindowCanvas::button_press_event()
                        break;
 
                case CWINDOW_ZOOM:
-                       test_zoom(redraw);
+                       result = test_zoom(redraw);
                        break;
 
                case CWINDOW_CROP: