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

* Desktop::SetFocusWindow() now takes kWindowScreenFeel windows into account,

Browse Source 
and does not give focus to any window behind that one.
* Added TODO comment to the DefaultDecorator bitmap caching mechanism (although,
  it really seems to be fast enough, anyway, at least once we remove no longer
  used bitmaps).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32536 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-08-20 09:18:32 +00:00
parent acc71e7c7c
commit 0d1d2de59b
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/servers/app/DefaultDecorator.cpp
View File

@ -1292,6 +1292,7 @@ DefaultDecorator::_GetBitmapForButton(int32 item, bool down, bool focus,
BAutolock locker(sBitmapListLock); BAutolock locker(sBitmapListLock);
// search our list for a matching bitmap // search our list for a matching bitmap
// TODO: use a hash map instead?
decorator_bitmap* current = sBitmapList; decorator_bitmap* current = sBitmapList;
while (current) { while (current) {
if (current->item == item && current->down == down if (current->item == item && current->down == down

33
src/servers/app/Desktop.cpp
View File

@ -1227,7 +1227,8 @@ Desktop::_UpdateFloating(int32 previousWorkspace, int32 nextWorkspace,
if (!_Windows(nextWorkspace).HasWindow(floating)) { if (!_Windows(nextWorkspace).HasWindow(floating)) {
// but wasn't before // but wasn't before
_Windows(nextWorkspace).AddWindow(floating, _Windows(nextWorkspace).AddWindow(floating,
floating->Frontmost(_Windows(nextWorkspace).FirstWindow(), nextWorkspace)); floating->Frontmost(_Windows(nextWorkspace).FirstWindow(),
nextWorkspace));
floating->SetCurrentWorkspace(nextWorkspace); floating->SetCurrentWorkspace(nextWorkspace);
if (mouseEventWindow != fFront) if (mouseEventWindow != fFront)
_ShowWindow(floating); _ShowWindow(floating);
@ -1438,6 +1439,15 @@ Desktop::_SendFakeMouseMoved(Window* window)
} }
/*! Tries to set the focus to the specified \a focus window. It will make sure,
however, that the window actually can have focus.
Besides the B_AVOID_FOCUS flag, a modal window, or a BWindowScreen can both
prevent it from getting focus.
In any case, this method makes sure that there is a focus window, if there
is any window at all, that is.
*/
void void
Desktop::SetFocusWindow(Window* focus) Desktop::SetFocusWindow(Window* focus)
{ {
@ -1451,9 +1461,24 @@ Desktop::SetFocusWindow(Window* focus)
} }
bool hasModal = _WindowHasModal(focus); bool hasModal = _WindowHasModal(focus);
bool hasWindowScreen = false;
if (!hasModal && focus != NULL) {
// Check whether or not a window screen is in front of the window
// (if it has a modal, the right thing is done, anyway)
Window* window = focus;
while (true) {
window = window->NextWindow(fCurrentWorkspace);
if (window == NULL || window->Feel() == kWindowScreenFeel)
break;
}
if (window != NULL)
hasWindowScreen = true;
}
if (focus == fFocus && focus != NULL && !focus->IsHidden() if (focus == fFocus && focus != NULL && !focus->IsHidden()
&& (focus->Flags() & B_AVOID_FOCUS) == 0 && !hasModal) { && (focus->Flags() & B_AVOID_FOCUS) == 0
&& !hasModal && !hasWindowScreen) {
// the window that is supposed to get focus already has focus // the window that is supposed to get focus already has focus
UnlockAllWindows(); UnlockAllWindows();
return; return;
@ -1464,7 +1489,7 @@ Desktop::SetFocusWindow(Window* focus)
if (fSettings->FocusFollowsMouse()) if (fSettings->FocusFollowsMouse())
list = kFocusList; list = kFocusList;
if (focus == NULL || hasModal) { if (focus == NULL || hasModal || hasWindowScreen) {
if (!fSettings->FocusFollowsMouse()) { if (!fSettings->FocusFollowsMouse()) {
focus = FrontWindow(); focus = FrontWindow();
if (focus == NULL) { if (focus == NULL) {
@ -1524,7 +1549,7 @@ Desktop::SetFocusWindow(Window* focus)
BAutolock locker(fApplicationsLock); BAutolock locker(fApplicationsLock);
for (int32 i = 0; i < fApplications.CountItems(); i++) { for (int32 i = 0; i < fApplications.CountItems(); i++) {
ServerApp *app = fApplications.ItemAt(i); ServerApp* app = fApplications.ItemAt(i);
if (oldActiveApp != -1 && app->ClientTeam() == oldActiveApp) if (oldActiveApp != -1 && app->ClientTeam() == oldActiveApp)
app->Activate(false); app->Activate(false);