From a916a5d9de450bc6a008d257d3c5c5cfd27e07ec Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Tue, 26 Oct 2021 15:12:22 -0500 Subject: [PATCH] Make sure the infobar is inserted before the tab content, not on top of (#11609) Fixes #11606 This is weird, but the infobars would appear totally on top of the TerminalPage when `showTabsInTitlebar:false`. This would result in the infobar obscuring the tabs. Now, the infobars are strictly inserted after the tabs, before the content. So when they appear, they will reduce the amount of space usable for the control. That is a little annoying, but preferable to the tabs totally not existing. Relevant conversation notes from #10798: > > If the info bar is not local to the tab, then its location between the tab > > bar (when the title bar is hidden) and the terminal panes feels > > misleading. Should it instead be above the tab bar or below the terminal > > panes? > > You're... not wrong here. It's maybe not the best place for it, but _on top_ > of the tabs would look insane, and probably wouldn't even work easily, given > the way we reparent the tab row into the titlebar. > > In the pane itself would make more sense, but that runs abreast of all sorts > of things like #9024, #4998, which might make more sense. I'm just gonna go with this now, because it's _better_ than before, while we work out what's _best_. ![gh-11606-fix](https://user-images.githubusercontent.com/18356694/138729178-b96b7003-0dd2-4521-8fff-0fd2a5989f22.gif) --- src/cascadia/TerminalApp/TerminalPage.xaml | 87 +++++++++++----------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml index ef16f6a7a..6c0705437 100644 --- a/src/cascadia/TerminalApp/TerminalPage.xaml +++ b/src/cascadia/TerminalApp/TerminalPage.xaml @@ -15,6 +15,7 @@ + @@ -22,8 +23,50 @@ + + + +