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.

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

Make sure the infobar is inserted before the tab content, not on top of #11609

Merged
2 commits merged into from
Oct 26, 2021

Conversation

zadjii-msft
Copy link
Member

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

  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_.
@ghost ghost added Area-User Interface Issues pertaining to the user interface of the Console or Terminal Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-2 A description (P2) Product-Terminal The new Windows Terminal. labels Oct 25, 2021
Comment on lines 25 to 31
<Grid Grid.Row="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" />
VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
Copy link
Member

Choose a reason for hiding this comment

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

Can't you merge this Grid with the one above like this:

    <Grid x:Name="Root"
          Background="Transparent">
        <Grid.RowDefinitions>
            <RowDefinition Height="Auto" />
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>

Then the controls are organized as such:

  • TabRowControl --> Grid.Row="0"
  • StackPanel of InfoBars --> Grid.Row="1"
  • TabContent --> Grid.Row="2"

Comment on lines 26 to 27
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" />
VerticalAlignment="Stretch">
Copy link
Member

Choose a reason for hiding this comment

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

Both of these are Stretch by default: (HorizAlignment)

@DHowett
Copy link
Member

DHowett commented Oct 25, 2021

reduce the amount of space usable for the control

Huh, I thought they already did. 😄

Copy link
Member

@DHowett DHowett left a comment

Choose a reason for hiding this comment

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

You may need to port this to 1.11 if it's annoying there.

@zadjii-msft zadjii-msft added zPreview-Service-Queued-1.13 A floating label that tracks the current Preview version for servicing purposes. zStable-Service-Queued-1.12 A floating label that tracks the current Stable version for servicing purposes. labels Oct 26, 2021
@DHowett DHowett added the AutoMerge Marked for automatic merge by the bot when requirements are met label Oct 26, 2021
@ghost
Copy link

ghost commented Oct 26, 2021

Hello @DHowett!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit a916a5d into main Oct 26, 2021
@ghost ghost deleted the dev/migrie/11606-infobars-under-tabs branch October 26, 2021 20:12
@KalleOlaviNiemitalo
Copy link

@zadjii-msft, what do you use for recording the GIF?

@zadjii-msft
Copy link
Member Author

https://www.screentogif.com/

It's free and works GREAT. It's got tons of other tools, but it's also super simple for just "grab a gif of the screen".

DHowett pushed a commit that referenced this pull request Dec 13, 2021
…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)

(cherry picked from commit a916a5d)
DHowett pushed a commit that referenced this pull request Dec 13, 2021
…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)

(cherry picked from commit a916a5d)
@DHowett DHowett removed zStable-Service-Queued-1.12 A floating label that tracks the current Stable version for servicing purposes. zPreview-Service-Queued-1.13 A floating label that tracks the current Preview version for servicing purposes. labels Dec 13, 2021
@ghost
Copy link

ghost commented Dec 14, 2021

🎉Windows Terminal Preview v1.12.3472.0 has been released which incorporates this pull request.:tada:

Handy links:

@ghost ghost mentioned this pull request Dec 14, 2021
@ghost
Copy link

ghost commented Dec 14, 2021

🎉Windows Terminal v1.11.3471.0 has been released which incorporates this pull request.:tada:

Handy links:

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-User Interface Issues pertaining to the user interface of the Console or Terminal AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-2 A description (P2) Product-Terminal The new Windows Terminal.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Info bar obscures tab bar
4 participants