X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=9724470dc31d927b695eaa452aa0b1531979858b;hp=1a1c3bfe2dd9589f18d140cd8052ac36d0c8df5f;hb=a4de4732339bf38b5b225c533be1bdf60748f04a;hpb=5a7faba81bcd03755bfe651bacbc5980171fe9de diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C index 1a1c3bfe..9724470d 100644 --- a/cinelerra-5.1/cinelerra/mwindowgui.C +++ b/cinelerra-5.1/cinelerra/mwindowgui.C @@ -120,6 +120,7 @@ MWindowGUI::MWindowGUI(MWindow *mwindow) plugin_menu = 0; keyframe_menu = 0; keyframe_hide = 0; + keyvalue_popup = 0; transition_menu = 0; remote_control = 0; cwindow_remote_handler = 0; @@ -134,6 +135,7 @@ MWindowGUI::~MWindowGUI() delete cwindow_remote_handler; delete record_remote_handler; delete remote_control; + delete keyvalue_popup; // delete samplescroll; // delete trackscroll; for(int i = 0; i < TOTAL_PANES; i++) @@ -403,10 +405,10 @@ int MWindowGUI::resize_event(int w, int h) int x = w - MainShBtns::calculate_w(0); mainmenu->resize_event(x, mainmenu->get_h()); mainshbtns->reposition_window(x, -1); + ffmpeg_toggle->reposition_window(menu_w(), menu_h()+2); mwindow->theme->get_mwindow_sizes(this, w, h); mwindow->theme->draw_mwindow_bg(this); mbuttons->resize_event(); - ffmpeg_toggle->reposition_window(menu_w(), menu_h()+2); statusbar->resize_event(); zoombar->resize_event(); @@ -533,6 +535,7 @@ int MWindowGUI::resize_event(int w, int h) mwindow->theme->mzoom_y + 1 - mwindow->theme->get_image_set("pane")[0]->get_h()); resource_thread->start_draw(); + flash(1); return 0; } @@ -1108,19 +1111,13 @@ void MWindowGUI::default_positions() } - - - - - - - - - - - - - +int MWindowGUI::button_release_event() +{ + if( keyvalue_popup ) { + delete keyvalue_popup; keyvalue_popup = 0; + } + return 0; +} int MWindowGUI::repeat_event(int64_t duration) @@ -1280,7 +1277,6 @@ int MWindowGUI::keypress_event() return result; } - int MWindowGUI::keyboard_listener(BC_WindowBase *wp) { return key_listener(wp->get_keypress()); @@ -1297,7 +1293,7 @@ int MWindowGUI::key_listener(int key) record->record_gui->interrupt_thread->start(0); break; case KPHAND: - mwindow->quit(0); + mwindow->quit(); break; #ifdef HAVE_DVB case KPBOOK: @@ -2270,7 +2266,6 @@ int PaneButton::cursor_motion_event() int PaneButton::button_release_event() { mwindow->gui->stop_pane_drag(); - int result = BC_Button::button_release_event(); return result; }