X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fgwindowgui.C;h=ce888faf6038343a5ec2ce5d5098c4781eb54706;hb=c98ecabef4f08c66ad7dbd3004cf7995e012dc3e;hp=f0a050a27b043b3150f1c849419c5072f037a0d1;hpb=e41864cf7931bfb86f68c5d35d4578dfe161d386;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/gwindowgui.C b/cinelerra-5.1/cinelerra/gwindowgui.C index f0a050a2..ce888faf 100644 --- a/cinelerra-5.1/cinelerra/gwindowgui.C +++ b/cinelerra-5.1/cinelerra/gwindowgui.C @@ -496,15 +496,29 @@ int GWindowGUI::close_event() int GWindowGUI::keypress_event() { - switch(get_keypress()) { - case KEY_F1: - if( !ctrl_down() && shift_down() ) + if( ctrl_down() && shift_down() ) { + switch(get_keypress()) { + case KEY_F1: + case KEY_F2: + case KEY_F3: + case KEY_F4: + if( ctrl_down() && shift_down() ) { + resend_event(mwindow->gui); + return 1; + } + } + } + else if( !ctrl_down() && shift_down() ) { + switch(get_keypress()) { + case KEY_F1: toggle_camera_xyz(); - break; - case KEY_F2: - if( !ctrl_down() && shift_down() ) + return 1; + case KEY_F2: toggle_projector_xyz(); - break; + return 1; + } + } + switch(get_keypress()) { case 'w': case 'W': case '0': @@ -615,7 +629,7 @@ int GWindowToggle::handle_event() MWindow *mwindow = gui->mwindow; mwindow->gui->lock_window("GWindowToggle::handle_event"); - mwindow->gui->update(1, 1, 0, 0, 1, 0, 0); + mwindow->gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0); mwindow->gui->draw_overlays(1); if( value && info->isauto > 0 ) {