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

Small fix: didn't make sure the previous focus was still part of the window.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15045 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-20 16:13:52 +00:00
parent 4aeff099bf
commit 26e09e5870
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/MenuBar.cpp
+2 -1
View File
@@ -478,7 +478,7 @@ BMenuBar::RestoreFocus()
if (BPrivate::gDefaultTokens.GetToken(fPrevFocusToken, B_HANDLER_TOKEN, if (BPrivate::gDefaultTokens.GetToken(fPrevFocusToken, B_HANDLER_TOKEN,
(void **)&handler, NULL) == B_OK) { (void **)&handler, NULL) == B_OK) {
BView *view = dynamic_cast<BView *>(handler); BView *view = dynamic_cast<BView *>(handler);
if (view != NULL) if (view != NULL && view->Window() == window)
view->MakeFocus(); view->MakeFocus();
} }
fPrevFocusToken = -1; fPrevFocusToken = -1;
@@ -486,6 +486,7 @@ BMenuBar::RestoreFocus()
} }
} }
void void
BMenuBar::InitData(menu_layout layout) BMenuBar::InitData(menu_layout layout)
{ {