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

StyledEdit: give initial focus to the TextView

Browse Source 
* Move the existing MakeFocus call to after the window layout is built.
* Also, add calls to Activate so that StyledEdit becomes the active
  window after its find or replace window is closed/hidden, even if
  another application is set to 'always on top.'
* Fixes #17733.

Change-Id: I8380e8ce2760ffa3f3467a618a0d843826e4ac99
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5416
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: humdinger <humdingerb@gmail.com>
Reviewed-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
This commit is contained in:
Jim906 2022-06-27 10:36:06 -04:00 committed by Adrien Destugues
parent 84360889a2
commit 5b5da451b3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/apps/stylededit/StyledEditWindow.cpp
View File

@ -268,11 +268,15 @@ StyledEditWindow::MessageReceived(BMessage* message)
case MSG_FIND_WINDOW_QUIT:
{
fFindWindow = NULL;
Activate();
// In case any 'always on top' application tries to make its
// window active after fFindWindow is closed.
break;
}
case MSG_REPLACE_WINDOW_QUIT:
{
fReplaceWindow = NULL;
Activate();
break;
}
case MSG_SEARCH:
@ -283,6 +287,7 @@ StyledEditWindow::MessageReceived(BMessage* message)
message->FindBool("backsearch", &fBackSearch);
_Search(fStringToFind, fCaseSensitive, fWrapAround, fBackSearch);
Activate();
break;
case MENU_FIND_AGAIN:
_Search(fStringToFind, fCaseSensitive, fWrapAround, fBackSearch);
@ -323,6 +328,7 @@ StyledEditWindow::MessageReceived(BMessage* message)
_Replace(fStringToFind, fReplaceString, fCaseSensitive, fWrapAround,
fBackSearch);
Activate();
break;
}
case MENU_REPLACE_SAME:
@ -346,6 +352,7 @@ StyledEditWindow::MessageReceived(BMessage* message)
SearchAllWindows(fStringToFind, fReplaceString, fCaseSensitive);
else
_ReplaceAll(fStringToFind, fReplaceString, fCaseSensitive);
Activate();
break;
}
@ -1163,7 +1170,6 @@ StyledEditWindow::_InitWindow(uint32 encoding)
fScrollView = new BScrollView("scrollview", fTextView, B_FOLLOW_ALL, 0,
true, true, B_PLAIN_BORDER);
fTextView->MakeFocus(true);
fStatusView = new StatusView(fScrollView);
fScrollView->AddChild(fStatusView);
@ -1360,6 +1366,7 @@ StyledEditWindow::_InitWindow(uint32 encoding)
.End();
SetKeyMenuBar(mainMenu);
fTextView->MakeFocus(true);
}