X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=74f3e1f3b9a0200bd57afa70de2453e3d9c296c6;hb=2ba7e9962ea989863e152373e96a09b00a0b4eb8;hp=660c6d88b18ede9b7fcd41b55c7c7f65147605c6;hpb=8f008f5c7d5d6fac72bf02358b8fa731c04156bb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 660c6d88..74f3e1f3 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++)
@@ -408,6 +410,7 @@ int MWindowGUI::resize_event(int w, int h)
 	mbuttons->resize_event();
 	ffmpeg_toggle->reposition_window(menu_w(), menu_h()+2);
 	statusbar->resize_event();
+	zoombar->resize_event();
 
 	resource_thread->stop_draw(1);
 
@@ -527,17 +530,11 @@ int MWindowGUI::resize_event(int w, int h)
 				pane[BOTTOM_RIGHT_PANE]->y);
 	}
 
-	resource_thread->start_draw();
-
 	update_pane_dividers();
-	zoombar->resize_event();
 	pane_button->reposition_window(w - mwindow->theme->get_image_set("pane")[0]->get_w(),
 		mwindow->theme->mzoom_y + 1 - mwindow->theme->get_image_set("pane")[0]->get_h());
-//	get_scrollbars(0);
-//	canvas->resize_event();
-//printf("MWindowGUI::resize_event %d\n", __LINE__);
-// required to get new widgets to appear after a pane deletion
-	show_window();
+	resource_thread->start_draw();
+
 	return 0;
 }
 
@@ -1059,7 +1056,8 @@ void MWindowGUI::default_positions()
 {
 //printf("MWindowGUI::default_positions 1\n");
 	VWindow *vwindow = mwindow->vwindows.size() > DEFAULT_VWINDOW ?
-		mwindow->vwindows.get(0) : 0;
+		mwindow->vwindows.get(DEFAULT_VWINDOW) : 0;
+	if( vwindow && !vwindow->is_running() ) vwindow = 0;
 	if( vwindow ) vwindow->gui->lock_window("MWindowGUI::default_positions");
 	mwindow->cwindow->gui->lock_window("MWindowGUI::default_positions");
 	mwindow->awindow->gui->lock_window("MWindowGUI::default_positions");
@@ -1112,19 +1110,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)
@@ -1249,6 +1241,7 @@ int MWindowGUI::keypress_event()
 	case LEFTTAB:
 		Track *this_track = 0;
 		for( int i=0; i<TOTAL_PANES; ++i ) {
+			if( !pane[i] ) continue;
 			if( (this_track = pane[i]->over_track()) != 0 ) break;
 			if( (this_track = pane[i]->over_patchbay()) != 0 ) break;
 		}
@@ -1283,7 +1276,6 @@ int MWindowGUI::keypress_event()
 	return result;
 }
 
-
 int MWindowGUI::keyboard_listener(BC_WindowBase *wp)
 {
 	return key_listener(wp->get_keypress());
@@ -2005,7 +1997,7 @@ void MWindowGUI::load_panes()
 						cursor_y,
 					mwindow->theme->mcanvas_x +
 						mwindow->theme->mcanvas_w -
-						cursor_x,
+						cursor_x -  mwindow->theme->pane_w,
 					mwindow->theme->mcanvas_h -
 						cursor_y);
 				pane[TOP_RIGHT_PANE]->create_objects();
@@ -2036,7 +2028,7 @@ void MWindowGUI::load_panes()
 						cursor_y,
 					mwindow->theme->mcanvas_x +
 						mwindow->theme->mcanvas_w -
-						cursor_x,
+						cursor_x - mwindow->theme->pane_w,
 					mwindow->theme->mcanvas_h -
 						cursor_y);
 				pane[BOTTOM_RIGHT_PANE]->resize_event(
@@ -2273,7 +2265,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;
 }