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

The LowColor() had to be resetted after having drawn the shortcut symbol. Corrected a weird typo.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10829 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2005-01-18 15:10:46 +00:00
parent 6c857bb9fe
commit 2cdfcae44b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/MenuItem.cpp
+6 -5
View File
@@ -400,8 +400,6 @@ BMenuItem::Draw()
fSuper->MovePenTo(ContentLocation()); fSuper->MovePenTo(ContentLocation());
DrawContent(); DrawContent();
fSuper->SetLowColor(ui_color(B_MENU_BACKGROUND_COLOR));
if (fSuper->Layout() == B_ITEMS_IN_COLUMN) { if (fSuper->Layout() == B_ITEMS_IN_COLUMN) {
if (IsMarked()) if (IsMarked())
@@ -413,6 +411,8 @@ BMenuItem::Draw()
if (Submenu()) if (Submenu())
DrawSubmenuSymbol(); DrawSubmenuSymbol();
} }
fSuper->SetLowColor(ui_color(B_MENU_BACKGROUND_COLOR));
} }
@@ -548,13 +548,14 @@ BMenuItem::Invoke(BMessage *message)
void void
BMenuItem::Uninstall() BMenuItem::Uninstall()
{ {
if (fSubmenu) if (fSubmenu != NULL)
fSubmenu->Uninstall(); fSubmenu->Uninstall();
if (Target() == fWindow) if (Target() == fWindow)
SetTarget(BMessenger()); SetTarget(BMessenger());
if (0x6c != 0 && fModifiers & B_COMMAND_KEY && fWindow) // TODO: I'm not sure about B_COMMAND_KEY
if (fShortcutChar != 0 && (fModifiers & B_COMMAND_KEY) && fWindow != NULL)
fWindow->RemoveShortcut(fShortcutChar, fModifiers); fWindow->RemoveShortcut(fShortcutChar, fModifiers);
fWindow = NULL; fWindow = NULL;
@@ -569,7 +570,7 @@ BMenuItem::SetSuper(BMenu *super)
fSuper = super; fSuper = super;
if (fSubmenu) if (fSubmenu != NULL)
fSubmenu->fSuper = super; fSubmenu->fSuper = super;
} }