Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some bugs in StealFocus, RemoveFocus and SetStickyMode

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17614 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2006-05-28 08:50:52 +00:00
parent cd39decc44
commit c1dd282b9b
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/kits/interface/Menu.cpp
View File

@ -1931,15 +1931,17 @@ BMenu::SetIgnoreHidden(bool on)
void
BMenu::SetStickyMode(bool on)
{
fStickyMode = on;
// TODO: Ugly hack, but it needs to be done right here in this method
BMenuBar *menuBar = dynamic_cast<BMenuBar *>(this);
if (on && menuBar != NULL && menuBar->LockLooper()) {
// Steal the focus from the current focus view
// (needed to handle keyboard navigation)
menuBar->StealFocus();
menuBar->UnlockLooper();
if (fStickyMode != on) {
// TODO: Ugly hack, but it needs to be done right here in this method
BMenuBar *menuBar = dynamic_cast<BMenuBar *>(this);
if (on && menuBar != NULL && menuBar->LockLooper()) {
// Steal the focus from the current focus view
// (needed to handle keyboard navigation)
menuBar->StealFocus();
menuBar->UnlockLooper();
}
fStickyMode = on;
}
// If we are switching to sticky mode, propagate the status

12
src/kits/interface/MenuBar.cpp
View File

@ -17,6 +17,7 @@
#include <MenuPrivate.h>
#include <TokenSpace.h>
using BPrivate::gDefaultTokens;
struct menubar_data {
BMenuBar *menuBar;
@ -509,13 +510,16 @@ BMenuBar::RestoreFocus()
BWindow *window = Window();
if (window != NULL && window->Lock()) {
BHandler *handler = NULL;
if (BPrivate::gDefaultTokens.GetToken(fPrevFocusToken, B_HANDLER_TOKEN,
(void **)&handler) == B_OK) {
if (fPrevFocusToken != -1
&& gDefaultTokens.GetToken(fPrevFocusToken, B_HANDLER_TOKEN, (void **)&handler) == B_OK) {
BView *view = dynamic_cast<BView *>(handler);
if (view != NULL && view->Window() == window)
view->MakeFocus();
}
fPrevFocusToken = -1;
fPrevFocusToken = -1;
} else if (IsFocus())
MakeFocus(false);
window->Unlock();
}
}