X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fmwindowgui.C;h=b0c0f53f2144a0cd86864715c3f8b58398f5c679;hb=c0125dcc1658cafc4758cca0b5d8bf88a98ed948;hp=13f7247524dd3db92a2e7ae1a4a8b6954d692f18;hpb=94e8dc2b306135e7735b2618a54f0f7de7ac7a0c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/mwindowgui.C b/cinelerra-5.0/cinelerra/mwindowgui.C
index 13f72475..b0c0f53f 100644
--- a/cinelerra-5.0/cinelerra/mwindowgui.C
+++ b/cinelerra-5.0/cinelerra/mwindowgui.C
@@ -58,8 +58,9 @@
 #include "renderengine.h"
 #include "resourcethread.h"
 #include "samplescroll.h"
-#include "swindow.h"
+#include "shbtnprefs.h"
 #include "statusbar.h"
+#include "swindow.h"
 #include "theme.h"
 #include "trackcanvas.h"
 #include "trackscroll.h"
@@ -258,7 +259,10 @@ void MWindowGUI::create_objects()
 	
 	if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
 
-	add_subwindow(mainmenu = new MainMenu(mwindow, this));
+	int x = get_w() - MainShBtns::calculate_w(0);
+	add_subwindow(mainmenu = new MainMenu(mwindow, this, x));
+	add_subwindow(mainshbtns = new MainShBtns(mwindow, x, 0));
+	mainshbtns->load(mwindow->preferences);
 	mwindow->theme->get_mwindow_sizes(this, get_w(), get_h());
 	mwindow->theme->draw_mwindow_bg(this);
 	mainmenu->create_objects();
@@ -385,7 +389,6 @@ int MWindowGUI::resize_event(int w, int h)
 	mwindow->session->mwindow_h = h;
 	mwindow->theme->get_mwindow_sizes(this, w, h);
 	mwindow->theme->draw_mwindow_bg(this);
-//	mainmenu->reposition_window(0, 0, w, mainmenu->get_h());
 	mbuttons->resize_event();
 	statusbar->resize_event();
 	
@@ -465,6 +468,9 @@ int MWindowGUI::resize_event(int w, int h)
 	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());
+	int x = get_w() - MainShBtns::calculate_w(0);
+	mainmenu->resize_event(x, mainmenu->get_h());
+	mainshbtns->reposition_window(x, 0);
 //	get_scrollbars(0);
 //	canvas->resize_event();
 //printf("MWindowGUI::resize_event %d\n", __LINE__);