maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

This is a checkpoint

Browse source 
* Dismissing a preview with an unfocused appearance is what's really broken here. That's never going to be able to go back to the original table, because the original table will be replaced with the unfocused appearance's table on the dismiss.
    - Going to fix that by using the focused appearance's table by default for the scheme when there's an unfocused appearance.
  * This is a little janky still, we flash the old schemes through on dismiss, which is probably wrong.
This commit is contained in:
Mike Griese 2021-11-11 08:28:53 -06:00
parent ae833a77bd
commit 2a18d7dae3
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cascadia/TerminalApp/ActionPreviewHandlers.cpp
View file

@ -67,8 +67,11 @@ namespace winrt::TerminalApp::implementation
// - <none>
void TerminalPage::_EndPreviewColorScheme()
{
for (const auto& f : _restorePreviewFuncs)
for (auto i{ _restorePreviewFuncs.rbegin() }; i < _restorePreviewFuncs.rend(); i++)
// for (const auto& f : _restorePreviewFuncs)
{
// f();
auto f = *i;
f();
}
_restorePreviewFuncs.clear();
@ -133,10 +136,10 @@ namespace winrt::TerminalApp::implementation
// bug. They resulted in a new bug: "previewing a scheme while using
// an unfocused apprearance, then dismissing -> unfocused scheme gets
// applied". Fix in morning.
_EndPreview();
// _EndPreview();
if (args == nullptr || args.ActionAndArgs() == nullptr)
{
// _EndPreview();
_EndPreview();
}
else
{