i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mail: use layout version of BMenuBar.

Browse Source 
* Fixes layout issue: the minimal size was incorrect.
* Moved variable declaration to where it is actually used.
This commit is contained in:
Axel Dörfler
2015-09-04 17:33:41 +02:00
parent 31c65be109
commit 50d381e862
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mail/MailWindow.cpp
+6 -12
View File
@@ -206,12 +206,7 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
if (messenger != NULL) if (messenger != NULL)
fTrackerMessenger = *messenger; fTrackerMessenger = *messenger;
BMenu* menu;
BMenu* subMenu;
BMenuItem* item;
BMessage* msg;
BFile file(ref, B_READ_ONLY); BFile file(ref, B_READ_ONLY);
if (ref) { if (ref) {
fRef = new entry_ref(*ref); fRef = new entry_ref(*ref);
fIncoming = true; fIncoming = true;
@@ -219,17 +214,16 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
fIncoming = false; fIncoming = false;
fAutoMarkRead = fApp->AutoMarkRead(); fAutoMarkRead = fApp->AutoMarkRead();
BRect r(0, 0, RIGHT_BOUNDARY, 15); fMenuBar = new BMenuBar("menuBar");
fMenuBar = new BMenuBar(r, "");
// File Menu // File Menu
menu = new BMenu(B_TRANSLATE("File")); BMenu* menu = new BMenu(B_TRANSLATE("File"));
msg = new BMessage(M_NEW); BMessage* msg = new BMessage(M_NEW);
msg->AddInt32("type", M_NEW); msg->AddInt32("type", M_NEW);
menu->AddItem(item = new BMenuItem(B_TRANSLATE("New mail message"), BMenuItem* item = new BMenuItem(B_TRANSLATE("New mail message"), msg, 'N');
msg, 'N')); menu->AddItem(item);
item->SetTarget(be_app); item->SetTarget(be_app);
// Cheap hack - only show the drafts menu when composing messages. Insert // Cheap hack - only show the drafts menu when composing messages. Insert
@@ -259,7 +253,7 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
if (!resending && fIncoming) { if (!resending && fIncoming) {
menu->AddSeparatorItem(); menu->AddSeparatorItem();
subMenu = new BMenu(B_TRANSLATE("Close and ")); BMenu* subMenu = new BMenu(B_TRANSLATE("Close and "));
read_flags flag; read_flags flag;
read_read_attr(file, flag); read_read_attr(file, flag);