X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=d9738c2cbe8c93b5989d85fd9487c6178d6604d2;hb=83b70dd60863377cb281e6be5206304e10373e30;hp=6ac2035c0bb9956f86b2cd741cda4d476cbf0580;hpb=c9c0e07706fad701a70ee0d1ffb0fcb6304f138c;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C index 6ac2035c..d9738c2c 100644 --- a/cinelerra-5.1/cinelerra/cwindowgui.C +++ b/cinelerra-5.1/cinelerra/cwindowgui.C @@ -113,6 +113,8 @@ CWindowGUI::CWindowGUI(MWindow *mwindow, CWindow *cwindow) control_out_x = control_out_y = 0; translating_zoom = 0; highlighted = 0; +// *** CONTEXT_HELP *** + context_help_set_keyword("Compositor Window"); } CWindowGUI::~CWindowGUI() @@ -592,6 +594,9 @@ int CWindowGUI::keypress_event() if( !result ) result = transport->keypress_event(); + if( !result ) + result = context_help_check_and_show(); + return result; } @@ -2648,6 +2653,7 @@ void CWindowCanvas::reset_keyframe(int do_camera) gui->mwindow->edl->local_session->reset_view_limits(); gui->mwindow->gui->zoombar->update_autozoom(); mgui->unlock_window(); + mwindow->save_backup(); } } @@ -3054,9 +3060,13 @@ int CWindowCanvas::test_bezier(int button_press, redraw = 1; } - float x_val = gui->affected_x->get_value(); - float y_val = gui->affected_y->get_value(); - float z_val = gui->affected_z->get_value(); + CWindowToolGUI *tool_gui = !gui->tool_panel ? 0 : gui->tool_panel->tool_gui; + int edge = tool_gui ? tool_gui->edge : 0; + int span = tool_gui ? tool_gui->span : 0; + + float x_val = gui->affected_x->get_value(edge); + float y_val = gui->affected_y->get_value(edge); + float z_val = gui->affected_z->get_value(edge); if( gui->translating_zoom ) { float z = gui->center_z + (cursor_y - gui->y_origin) / yS(128); @@ -3066,7 +3076,7 @@ int CWindowCanvas::test_bezier(int button_press, redraw = 1; redraw_canvas = 1; } - gui->affected_z->set_value(z); + gui->affected_z->bump_value(z, edge, span); } else { float dx = cursor_x - gui->x_origin; @@ -3077,8 +3087,8 @@ int CWindowCanvas::test_bezier(int button_press, } float x = gui->center_x + dx; float y = gui->center_y + dy; - gui->affected_x->set_value(x); - gui->affected_y->set_value(y); + gui->affected_x->bump_value(x, edge, span); + gui->affected_y->bump_value(y, edge, span); if( !EQUIV(x_val, x) || !EQUIV(y_val, y) ) { rerender = 1; redraw = 1;