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

Only focus the active pane once initialization is complete #10978

Merged
5 commits merged into from
Aug 24, 2021
Merged

Only focus the active pane once initialization is complete #10978

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3e3be9
This sorta works to solve #6586
zadjii-msft Aug 18, 2021
86eeadd
This fixes some fallout issues
zadjii-msft Aug 18, 2021
b0f37ee
Comments, i'm not a barbarian
zadjii-msft Aug 18, 2021
aa274c8
Merge remote-tracking branch 'origin/main' into dev/migrie/b/6586-spl…
zadjii-msft Aug 23, 2021
f2e0881
Merge remote-tracking branch 'origin/main' into dev/migrie/b/6586-spl…
zadjii-msft Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/cascadia/TerminalApp/TerminalPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,11 @@ namespace winrt::TerminalApp::implementation
co_return;
}
}

// GH#6586: now that we're done processing all startup commands,
// focus the active control. This will work as expected for both
// commandline invocations and for `wt` action invocations.
_GetActiveControl().Focus(FocusState::Programmatic);
}
if (initial)
{
Expand Down Expand Up @@ -1369,6 +1374,14 @@ namespace winrt::TerminalApp::implementation
_UnZoomIfNeeded();

tab.SplitPane(realSplitType, splitSize, realGuid, newControl);

// After GH#6586, the control will no longer focus itself
// automatically when it's finished being laid out. Manually focus
// the control here instead.
if (_startupState == StartupState::Initialized)
{
_GetActiveControl().Focus(FocusState::Programmatic);
}
}
CATCH_LOG();
}
Expand Down
11 changes: 4 additions & 7 deletions src/cascadia/TerminalControl/TermControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
DispatcherTimer cursorTimer;
cursorTimer.Interval(std::chrono::milliseconds(blinkTime));
cursorTimer.Tick({ get_weak(), &TermControl::_CursorTimerTick });
cursorTimer.Start();
_cursorTimer.emplace(std::move(cursorTimer));
// As of GH#6586, don't start the cursor timer immediately, and
// don't show the cursor initially. We'll show the cursor and start
// the timer when the control is first focused. cursorTimer.Start();
_core.CursorOn(false);
}
else
{
Expand Down Expand Up @@ -709,12 +712,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
// Now that the renderer is set up, update the appearance for initialization
_UpdateAppearanceFromUIThread(_settings);

// Focus the control here. If we do it during control initialization, then
// focus won't actually get passed to us. I believe this is because
// we're not technically a part of the UI tree yet, so focusing us
// becomes a no-op.
this->Focus(FocusState::Programmatic);

_initializedTerminal = true;

// Likewise, run the event handlers outside of lock (they could
Expand Down