Skip to content

Commit

Permalink
Merge branch 'dev/migrie/fhl/scratchpad-pane' into dev/migrie/f/sui-p…
Browse files Browse the repository at this point in the history
…anes
  • Loading branch information
zadjii-msft committed Mar 21, 2024
2 parents 77022e9 + d417934 commit 216cc3f
Showing 1 changed file with 1 addition and 25 deletions.
26 changes: 1 addition & 25 deletions src/cascadia/TerminalApp/TerminalTab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,7 @@ namespace winrt::TerminalApp::implementation
{
// If visual is set, we need to bubble this event all the way to app host to flash the taskbar
// In this part of the chain we bubble it from the hosting tab to the page
tab->_TabRaiseVisualBellHandlers();
tab->TabRaiseVisualBell.raise();
}

// Show the bell indicator in the tab header
Expand Down Expand Up @@ -1351,30 +1351,6 @@ namespace winrt::TerminalApp::implementation
}
});

// Add a PaneRaiseBell event handler to the Pane
auto bellToken = pane->PaneRaiseBell([weakThis](auto&& /*s*/, auto&& visual) {
if (auto tab{ weakThis.get() })
{
if (visual)
{
// If visual is set, we need to bubble this event all the way to app host to flash the taskbar
// In this part of the chain we bubble it from the hosting tab to the page
tab->TabRaiseVisualBell.raise();
}

// Show the bell indicator in the tab header
tab->ShowBellIndicator(true);

// If this tab is focused, activate the bell indicator timer, which will
// remove the bell indicator once it fires
// (otherwise, the indicator is removed when the tab gets focus)
if (tab->_focusState != WUX::FocusState::Unfocused)
{
tab->ActivateBellIndicatorTimer();
}
}
});

// box the event token so that we can give a reference to it in the
// event handler.
auto detachedToken = std::make_shared<winrt::event_token>();
Expand Down

0 comments on commit 216cc3f

Please sign in to comment.