Skip to content

Conversation

@yaira2
Copy link
Member

@yaira2 yaira2 commented May 21, 2024

Resolved / Related Issues

To prevent extra work, all changes to the Files codebase must link to an approved issue marked as Ready to build. Please insert the issue number following the hashtag with the issue number that this Pull Request resolves.

  • Closes #

Steps used to test these changes

Stability is a top priority for Files and all changes are required to go through testing before being merged into the repo. Please include a list of steps that you used to test this PR.

  1. Opened Files ...
  2. ...

Comment on lines -183 to -184
<Setter Target="Content.CornerRadius" Value="0" />
<Setter Target="Content.BorderThickness" Value="0,1,0,1" />
Copy link
Member Author

Choose a reason for hiding this comment

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

Content is floating now so we don't need to modify via the visual state

<Setter Target="Content.BorderThickness" Value="0,1,0,1" />
<Setter Target="SidebarResizer.Visibility" Value="Collapsed" />
<Setter Target="ContentPresenter.Margin" Value="0,0,0,0" />
<Setter Target="ContentPresenter.Margin" Value="8,0,8,0" />
Copy link
Member Author

Choose a reason for hiding this comment

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

The regular margin is 2,0,8,0 but in the narrow view the sidebar is hidden and thus, we change to 8,0,8,0.

<Border
x:Name="ContentHeaderPresenter"
Grid.Row="0"
Margin="0,0,0,4"
Copy link
Member Author

Choose a reason for hiding this comment

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

This margin provides space between the header and content. I'm not so happy about this and I'm open to other ideas.

}
}
else
appearance.AppThemeAddressBarBackgroundColor = ""; //migrate to new default
Copy link
Member Author

Choose a reason for hiding this comment

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

It's been a while since we've migrated to the new default so I think this can be removed.

@yaira2 yaira2 requested review from 0x5bfa and marcelwgn May 21, 2024 21:48
@yaira2 yaira2 added the ready for review Pull requests that are ready for review label May 21, 2024
</UserControl.Resources>

<Grid Padding="8,0">
<Grid Padding="8,0,0,0">
Copy link
Member Author

Choose a reason for hiding this comment

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

Removed the right spacing to match the content area

Grid.Column="2"
MinWidth="4"
Margin="0,8,0,40"
Margin="0,60,0,40"
Copy link
Member Author

Choose a reason for hiding this comment

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

Increased margin to reflect the floating toolbar

@yaira2 yaira2 requested a review from 0x5bfa May 22, 2024 14:24
Copy link
Member

@0x5bfa 0x5bfa left a comment

Choose a reason for hiding this comment

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

Codequalitylooka good to me.

@yaira2 yaira2 added ready to merge Pull requests that are approved and ready to merge and removed ready for review Pull requests that are ready for review labels May 22, 2024
@yaira2 yaira2 merged commit 290bb3d into main May 22, 2024
@yaira2 yaira2 deleted the ya/ToolbarDesign branch May 22, 2024 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready to merge Pull requests that are approved and ready to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants