Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refocus Code Editor after pressing ReplaceAll button #70520

Closed
wants to merge 2 commits into from
Closed

Refocus Code Editor after pressing ReplaceAll button #70520

wants to merge 2 commits into from

Conversation

stmSi
Copy link
Contributor

@stmSi stmSi commented Dec 24, 2022 •
edited
Loading

Fix: #70049

for 3.x: #70521

@stmSi stmSi requested a review from a team as a code owner December 24, 2022 10:00
@stmSi stmSi mentioned this pull request Dec 24, 2022
Open
@stmSi stmSi changed the title Hide FindReplaceBar after ReplaceAll occurences [4.0] Hide FindReplaceBar after replacing all occurences Dec 24, 2022
@stmSi stmSi force-pushed the close-FindReplaceBar-after-replace-all branch from 227f51c to 3d59654 Compare December 24, 2022 11:24
@stmSi stmSi changed the title [4.0] Hide FindReplaceBar after replacing all occurences [4.0] Refocus Code Editor after pressing ReplaceAll button Dec 24, 2022
@DissonantVoid
Copy link
Contributor

shouldn't you also change the replace function to do the same? pressing the replace button also takes focus

@stmSi
Copy link
Contributor Author

stmSi commented Dec 24, 2022

Oh right.

@stmSi stmSi force-pushed the close-FindReplaceBar-after-replace-all branch 4 times, most recently from 7b77f1c to d1470e9 Compare December 24, 2022 13:08
@Chaosus Chaosus added this to the 4.0 milestone Dec 24, 2022
@stmSi
Copy link
Contributor Author

stmSi commented Dec 25, 2022

done

@akien-mga akien-mga changed the title [4.0] Refocus Code Editor after pressing ReplaceAll button Refocus Code Editor after pressing ReplaceAll button Feb 17, 2023
@akien-mga akien-mga modified the milestones: 4.0, 4.1 Feb 17, 2023
akien-mga
akien-mga reviewed Feb 17, 2023
View reviewed changes
@stmSi stmSi force-pushed the close-FindReplaceBar-after-replace-all branch from d1470e9 to e98cd3f Compare February 17, 2023 11:01
@MewPurPur
Copy link
Contributor

MewPurPur commented Apr 10, 2023 •
edited
Loading

Wait no

MewPurPur
MewPurPur reviewed Apr 10, 2023
View reviewed changes
@stmSi stmSi force-pushed the close-FindReplaceBar-after-replace-all branch from e98cd3f to 142c83b Compare April 10, 2023 14:28
@stmSi
Copy link
Contributor Author

stmSi commented Apr 10, 2023

Looking at the code again after months, I just found much better solution for #70049 .
Can u check again @MewPurPur ?

@stmSi stmSi force-pushed the close-FindReplaceBar-after-replace-all branch from 142c83b to 6864ab8 Compare April 10, 2023 14:40
@akien-mga akien-mga requested a review from a team June 19, 2023 19:57
@YuriSizov YuriSizov modified the milestones: 4.1, 4.2 Jun 20, 2023
YuriSizov
YuriSizov suggested changes Jun 20, 2023
View reviewed changes
@akien-mga
Copy link
Member

Could you rebase to get rid of the merge commit?

Also, the commit message "Fixed: ESC key not closing the FindReplaceBar" and the PR title "Refocus Code Editor after pressing ReplaceAll button" don't match, I'm not sure which is more accurate (the former of the PR title is better though). Could be worth clarifying.

KoBeWi
KoBeWi reviewed Jul 5, 2023
View reviewed changes
editor/code_editor.cpp
@@ -126,7 +126,7 @@ void FindReplaceBar::unhandled_input(const Ref<InputEvent> &p_event) {
if (k.is_valid() && k->is_action_pressed(SNAME("ui_cancel"), false, true)) {
Control *focus_owner = get_viewport()->gui_get_focus_owner();

if (text_editor->has_focus() || (focus_owner && vbc_lineedit->is_ancestor_of(focus_owner))) {
if (text_editor->has_focus() || (focus_owner && this->is_ancestor_of(focus_owner))) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (text_editor->has_focus() || (focus_owner && this->is_ancestor_of(focus_owner))) {
if (text_editor->has_focus() || (focus_owner && is_ancestor_of(focus_owner))) {

@KoBeWi
Copy link
Member

KoBeWi commented Jul 5, 2023

The PR title is outdated and doesn't describe the changes anymore.

@stmSi
Copy link
Contributor Author

stmSi commented Jul 5, 2023 •
edited
Loading

@KoBeWi @akien-mga @YuriSizov I made a new PR #79079 .... I don't what went wrong with my current local branch... It is very messy because of the merge commits and rebase stuffs.

@stmSi stmSi closed this Jul 5, 2023
@KoBeWi KoBeWi added the archived label Jul 5, 2023
@stmSi stmSi deleted the close-FindReplaceBar-after-replace-all branch July 5, 2023 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KoBeWi KoBeWi KoBeWi approved these changes

@akien-mga akien-mga akien-mga left review comments

@MewPurPur MewPurPur MewPurPur approved these changes

@YuriSizov YuriSizov YuriSizov requested changes

Assignees
No one assigned
Labels
archived bug topic:editor
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.

ESC key does not work sometimes in the script editor.
7 participants
@stmSi @DissonantVoid @MewPurPur @akien-mga @KoBeWi @YuriSizov @Chaosus