hrev56229 adds 1 changeset to branch 'master'
old head: 84360889a277fc87213e491137a449d1e4238b33
new head: 5b5da451b3b1e4432b2c52c26a2f592dceba136f
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=5b5da451b3b1+%5E84360889a277
----------------------------------------------------------------------------
5b5da451b3b1: StyledEdit: give initial focus to the TextView
* 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@xxxxxxxxxxxx>
Reviewed-by: humdinger <humdingerb@xxxxxxxxx>
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
[ Jim906 <jim_l@xxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev56229
Commit: 5b5da451b3b1e4432b2c52c26a2f592dceba136f
URL: https://git.haiku-os.org/haiku/commit/?id=5b5da451b3b1
Author: Jim906 <jim_l@xxxxxxxxxxxx>
Date: Mon Jun 27 14:36:06 2022 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Wed Jun 29 06:44:08 2022 UTC
Ticket: https://dev.haiku-os.org/ticket/17733
----------------------------------------------------------------------------
1 file changed, 8 insertions(+), 1 deletion(-)
src/apps/stylededit/StyledEditWindow.cpp | 9 ++++++++-
----------------------------------------------------------------------------
diff --git a/src/apps/stylededit/StyledEditWindow.cpp
b/src/apps/stylededit/StyledEditWindow.cpp
index c65574b095..cb8f3f822d 100644
--- a/src/apps/stylededit/StyledEditWindow.cpp
+++ b/src/apps/stylededit/StyledEditWindow.cpp
@@ -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);
}
