The menu window's rect was never initialized, it worked by pure luck if launched from the terminal. Fixes bug 263. Other changes. Not yet finished

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16634 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/preferences/menu/BitmapMenuItem.h

@@ -5,8 +5,6 @@
 #include <String.h>
 
 class BBitmap;
-
-// MBitmapMenuItem class declaration
 class BitmapMenuItem : public BMenuItem {
 public:
 				BitmapMenuItem(const char* name, BMessage* message, BBitmap* bmp,

src/preferences/menu/ColorWindow.cpp

@@ -40,7 +40,6 @@ void
 ColorWindow::MessageReceived(BMessage *msg)
 {
 	switch(msg->what) {
-	
 		case MENU_REVERT:
 			colorPicker->SetValue(revert_info.background_color);
 			info.background_color = colorPicker->ValueAsColor();
@@ -58,16 +57,16 @@ ColorWindow::MessageReceived(BMessage *msg)
 			color.alpha = 255;
 			colorPicker->SetValue(color);
 		
-	case MENU_COLOR:{
+		case MENU_COLOR:
 			get_menu_info(&info);
 			info.background_color = colorPicker->ValueAsColor();
 			set_menu_info(&info);
 			be_app->PostMessage(UPDATE_WINDOW);
-		break;}
+			break;
 		
 		default:
 			be_app->PostMessage(UPDATE_WINDOW);
-		BMessage(msg);
+			BWindow::MessageReceived(msg);
 			break;
 	}
 }	

src/preferences/menu/ColorWindow.h

@@ -7,10 +7,11 @@
 class BColorControl;
 class BButton;
 class ColorWindow : public BWindow {
-	public:
+public:
 			ColorWindow();
 	virtual void	MessageReceived(BMessage *msg);
 
+private:	
 	BColorControl 	*colorPicker;
 	BButton 	*DefaultButton;
 	BButton 	*RevertButton;

src/preferences/menu/MenuApp.cpp

@@ -5,18 +5,8 @@
 MenuApp::MenuApp()
 	: BApplication("application/x-vnd.Be-GGUI")
 {
-	get_menu_info(&info);
+	fMenuWindow = new MenuWindow(BRect(100, 100, 400, 300));
-	
+	fMenuWindow->Show();
-	menuWindow = new MenuWindow();
-	Update();
-	menuWindow->Show();
-}
-
-
-void
-MenuApp::Update()
-{
-	menuWindow->Update();
 }
 	
 	
@@ -24,7 +14,6 @@ void
 MenuApp::MessageReceived(BMessage *msg)
 {
 	switch(msg->what) {
-	
 		//others
 		case UPDATE_WINDOW:
 		case CLICK_OPEN_MSG:
@@ -33,7 +22,7 @@ MenuApp::MessageReceived(BMessage *msg)
 		case ALT_MARKED_MSG:
 		case COLOR_SCHEME_MSG:
 		case MENU_COLOR:
-			menuWindow->PostMessage(msg);
+			fMenuWindow->PostMessage(msg);
 			break;
 					
 		default:

src/preferences/menu/MenuApp.h

@@ -2,20 +2,15 @@
 #define __MENU_APP_H
 
 #include <Application.h>
-#include <Menu.h>
 
 class MenuWindow;	
 class MenuApp : public BApplication {
 public:
 			MenuApp();
-	virtual void	Update();
 	virtual void	MessageReceived(BMessage *msg);
 	
 private:
-	MenuWindow	*menuWindow;
+	MenuWindow	*fMenuWindow;
-	BRect		rect;
-	menu_info	info;
-	BMenu 		*menu;
 };
 	
 #endif

src/preferences/menu/MenuBar.cpp

@@ -44,14 +44,14 @@ MenuBar::build_menu()
 	separatorStyleMenu->SetRadioMode(true);
 	BMessage *msg = new BMessage(MENU_SEP_TYPE);
 	msg->AddInt32("sep", 0);
-	separatorStyleZero = new BitmapMenuItem("                 ", msg,
+	separatorStyleZero = new BitmapMenuItem("separator0", msg,
 						BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP0"));
 	msg = new BMessage(MENU_SEP_TYPE);
 	msg->AddInt32("sep", 1);
-	separatorStyleOne = new BitmapMenuItem("", msg, BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP1"));
+	separatorStyleOne = new BitmapMenuItem("separator1", msg, BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP1"));
 	msg = new BMessage(MENU_SEP_TYPE);
 	msg->AddInt32("sep", 2);
-	separatorStyleTwo = new BitmapMenuItem("", msg, BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP2"));
+	separatorStyleTwo = new BitmapMenuItem("separator2", msg, BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP2"));
 	if (info.separator == 0)
 		separatorStyleZero->SetMarked(true);
 	if (info.separator == 1)
@@ -119,6 +119,7 @@ MenuBar::Update()
 		separatorStyleOne->SetMarked(true);
 	else if (info.separator == 2)
 		separatorStyleTwo->SetMarked(true);
+	
 	set_menu();
 	
 	BFont font;

src/preferences/menu/MenuWindow.cpp

@@ -13,34 +13,41 @@
 #include <MenuItem.h>
 #include <Roster.h>
 	
-MenuWindow::MenuWindow()
+MenuWindow::MenuWindow(BRect rect)
-	: BWindow(rect, "Menu", B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
+	: BWindow(rect, "Menu", B_TITLED_WINDOW,
+			B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE)
 {
  	get_menu_info(&revert_info);
  	get_menu_info(&info);
  	
  	revert = false;
  	
- 	MoveTo((rect.left += 100),(rect.top += 100));
 	menuView = new BBox(Bounds(), "menuView", B_FOLLOW_ALL_SIDES,
 				B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP, B_PLAIN_BORDER);
 	AddChild(menuView);
 	
 	menuBar = new MenuBar();
 	menuView->AddChild(menuBar);
-	defaultButton = new BButton(BRect(10,0,85,20), "Default", "Defaults",
-		new BMessage(MENU_DEFAULT), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM, B_WILL_DRAW | B_NAVIGABLE);
-	revertButton = new BButton(BRect(95,0,175,20), "Revert", "Revert",
-		new BMessage(MENU_REVERT), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM, B_WILL_DRAW | B_NAVIGABLE);
-	revertButton->SetEnabled(false);
 			
+	// resize the window according to the size of menuBar
+	ResizeTo((menuBar->Frame().right + 35), (menuBar->Frame().bottom + 45));
+	
+	BRect menuBarFrame = menuBar->Frame();
+	BRect buttonFrame(menuBarFrame.left, menuBarFrame.bottom + 10, menuBarFrame.left + 75, menuBarFrame.bottom + 30);
+	
+	defaultButton = new BButton(buttonFrame, "Default", "Defaults", new BMessage(MENU_DEFAULT),
+					B_FOLLOW_LEFT | B_FOLLOW_BOTTOM, B_WILL_DRAW | B_NAVIGABLE);
 	menuView->AddChild(defaultButton);
+	
+	buttonFrame.OffsetBy(buttonFrame.Width() + 20, 0);
+	revertButton = new BButton(buttonFrame, "Revert", "Revert", new BMessage(MENU_REVERT),
+					B_FOLLOW_LEFT | B_FOLLOW_BOTTOM, B_WILL_DRAW | B_NAVIGABLE);
+	revertButton->SetEnabled(false);
 	menuView->AddChild(revertButton);
 	
 	menuView->MakeFocus();
 	
 	Update();	
-	
 }
 
 
@@ -48,7 +55,6 @@ void
 MenuWindow::MessageReceived(BMessage *msg)
 {
 	switch(msg->what) {
-	
 		case MENU_REVERT:
 			set_menu_info(&revert_info);
 			revert = false;
@@ -79,9 +85,9 @@ MenuWindow::MessageReceived(BMessage *msg)
 		
 		case MENU_FONT_SIZE:
 			revert = true;
-		float f;
+			float fontSize;
-		msg->FindFloat("size", &f);
+			msg->FindFloat("size", &fontSize);
-		info.font_size = f;
+			info.font_size = fontSize;
 			set_menu_info(&info);
 			Update();
 			break;
@@ -155,20 +161,12 @@ MenuWindow::MessageReceived(BMessage *msg)
 			break;
 		
 		default:
-		BMessage(msg);
+			BWindow::MessageReceived(msg);
 			break;
 	}
 }
 
 
-bool
-MenuWindow::QuitRequested()
-{
-	be_app->PostMessage(B_QUIT_REQUESTED);
-	return BWindow::QuitRequested();
-}
-
-
 void
 MenuWindow::Update()
 {
@@ -176,9 +174,6 @@ MenuWindow::Update()
    
 	// alert the rest of the application to update	
 	menuBar->Update();
-	
-	// resize the window according to the size of menuBar
-	ResizeTo((menuBar->Frame().right + 35), (menuBar->Frame().bottom + 45));
 }
 
 

src/preferences/menu/MenuWindow.h

@@ -1,19 +1,18 @@
 #ifndef __MENU_WINDOW_H
 #define __MENU_WINDOW_H
 
+#include <Menu.h>
 #include <Window.h>
 
 class ColorWindow;
 class BMenuItem;
-class BMenu;
 class BBox;
 class BButton;
 class MenuBar;
 class MenuWindow : public BWindow {
 public:
-			MenuWindow();
+			MenuWindow(BRect frame);
 	virtual void	MessageReceived(BMessage *msg);
-	virtual bool	QuitRequested();
 	virtual	void	Update();
 		void	Defaults();
 
@@ -23,7 +22,6 @@ private:
 	BMenuItem 	*toggleItem;
 	menu_info	info;
 	menu_info	revert_info;
-	BRect		rect;	
 	BMenu		*menu;
 	MenuBar		*menuBar;
 	BBox		*menuView;