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.

Sign up for GitHub

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

Jump to bottom

Add scrollviewers to settings UI #7998

Merged
merged 1 commit into from
Oct 22, 2020
Merged

Add scrollviewers to settings UI #7998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,39 +57,40 @@ the MIT License. See LICENSE in the project root for license information. -->
</DataTemplate>
</Page.Resources>


<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock x:Uid="ColorScheme_ColorSchemes"
<ScrollViewer>
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock x:Uid="ColorScheme_ColorSchemes"
Style="{StaticResource SubheaderTextBlockStyle}"
Margin="0,0,0,20"
Grid.Row="0" />

<StackPanel Grid.Row="1"
<StackPanel Grid.Row="1"
Grid.Column="0">
<ComboBox x:Name="ColorSchemeComboBox"
<ComboBox x:Name="ColorSchemeComboBox"
SelectedIndex="0"
ItemsSource="{x:Bind ColorSchemeList, Mode=OneWay}"
SelectionChanged="ColorSchemeSelectionChanged" Width="160">
</ComboBox>
</StackPanel>
</ComboBox>
</StackPanel>

<ScrollViewer Grid.Row="2"
<ScrollViewer Grid.Row="2"
Grid.Column="0"
HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto">
<ItemsControl x:Name="ColorTableControl"
<ItemsControl x:Name="ColorTableControl"
ItemsSource="{x:Bind CurrentColorTable, Mode=TwoWay}"
ItemTemplate="{StaticResource ColorTableTemplate}">
</ItemsControl>
</ScrollViewer>
</Grid>
</ItemsControl>
</ScrollViewer>
</Grid>
</ScrollViewer>
</Page>
57 changes: 29 additions & 28 deletions src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,36 @@ the MIT License. See LICENSE in the project root for license information. -->
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:Controls="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d">

<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
<ScrollViewer>
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
Margin="0,12,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock x:Uid="Globals_GlobalAppearance"
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock x:Uid="Globals_GlobalAppearance"
Style="{StaticResource SubheaderTextBlockStyle}"
Margin="0,0,0,20" />
<StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,100,0">
<Controls:RadioButtons x:Uid="Globals_Theme" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse">
<RadioButton x:Uid="Globals_ThemeDefault" x:Name="DefaultTheme"/>
<RadioButton x:Uid="Globals_ThemeDark" x:Name="DarkTheme"/>
<RadioButton x:Uid="Globals_ThemeLight" x:Name="LightTheme"/>
</Controls:RadioButtons>
<CheckBox x:Uid="Globals_ShowTitlebar" IsChecked="{x:Bind GlobalSettings.ShowTabsInTitlebar, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_ShowTitleInTitlebar" IsChecked="{x:Bind GlobalSettings.ShowTitleInTitlebar, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_AlwaysShowTabs" IsChecked="{x:Bind GlobalSettings.AlwaysShowTabs, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<Controls:RadioButtons x:Uid="Globals_TabWidthMode" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse">
<RadioButton x:Uid="Globals_TabWidthModeEqual" x:Name="EqualTabWidthMode"/>
<RadioButton x:Uid="Globals_TabWidthModeTitleLength" x:Name="TitleLengthTabWidthMode"/>
<RadioButton x:Uid="Globals_TabWidthModeCompact" x:Name="CompactTabWidthMode"/>
</Controls:RadioButtons>
<CheckBox x:Uid="Globals_ConfirmCloseAllTabs" IsChecked="{x:Bind GlobalSettings.ConfirmCloseAllTabs, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
</StackPanel>
</Grid>
<StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,100,0">
<Controls:RadioButtons x:Uid="Globals_Theme" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse">
<RadioButton x:Uid="Globals_ThemeDefault" x:Name="DefaultTheme"/>
<RadioButton x:Uid="Globals_ThemeDark" x:Name="DarkTheme"/>
<RadioButton x:Uid="Globals_ThemeLight" x:Name="LightTheme"/>
</Controls:RadioButtons>
<CheckBox x:Uid="Globals_ShowTitlebar" IsChecked="{x:Bind GlobalSettings.ShowTabsInTitlebar, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_ShowTitleInTitlebar" IsChecked="{x:Bind GlobalSettings.ShowTitleInTitlebar, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_AlwaysShowTabs" IsChecked="{x:Bind GlobalSettings.AlwaysShowTabs, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<Controls:RadioButtons x:Uid="Globals_TabWidthMode" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse">
<RadioButton x:Uid="Globals_TabWidthModeEqual" x:Name="EqualTabWidthMode"/>
<RadioButton x:Uid="Globals_TabWidthModeTitleLength" x:Name="TitleLengthTabWidthMode"/>
<RadioButton x:Uid="Globals_TabWidthModeCompact" x:Name="CompactTabWidthMode"/>
</Controls:RadioButtons>
<CheckBox x:Uid="Globals_ConfirmCloseAllTabs" IsChecked="{x:Bind GlobalSettings.ConfirmCloseAllTabs, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
</StackPanel>
</Grid>
</ScrollViewer>
</Page>
117 changes: 59 additions & 58 deletions src/cascadia/TerminalSettingsEditor/Home.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,62 +17,63 @@ the MIT License. See LICENSE in the project root for license information. -->
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Page.Resources>

<Frame x:Name="frame">
<Frame.ContentTransitions>
<TransitionCollection>
<NavigationThemeTransition/>
</TransitionCollection>
</Frame.ContentTransitions>
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
Margin="0,12,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0"
Text="Windows Terminal Settings"
Style="{StaticResource HeaderTextBlockStyle}"
TextAlignment="Center"
Margin="0,0,0,20" />
<GridView Grid.Row="1"
x:Name="HomeGridView"
ItemsSource="{x:Bind HomeViewModel.HomeGridItems}"
ItemContainerStyle="{StaticResource GridViewItemStyle}"
IsItemClickEnabled="True"
SelectionMode="None"
ItemClick="HomeGridItemClickHandler">
<GridView.ItemTemplate>
<DataTemplate x:DataType="local:HomeGridItem">
<UserControl>
<Grid
x:Name="homeGridItemRoot"
Width="344"
Height="140"
Padding="12"
Background="{ThemeResource SystemControlBackgroundListLowBrush}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<RelativePanel Grid.Column="1" Grid.ColumnSpan="2" Margin="16,6,0,0">
<TextBlock
x:Name="titleText"
Style="{StaticResource SubheaderTextBlockStyle}"
Text="{x:Bind Title}"
Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
TextLineBounds="TrimToCapHeight"
TextWrapping="NoWrap" />
</RelativePanel>
</Grid>
</UserControl>
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
</Grid>
</Frame>
<ScrollViewer>
<Frame x:Name="frame">
<Frame.ContentTransitions>
<TransitionCollection>
<NavigationThemeTransition/>
</TransitionCollection>
</Frame.ContentTransitions>
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
Margin="0,12,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0"
Text="Windows Terminal Settings"
Style="{StaticResource HeaderTextBlockStyle}"
TextAlignment="Center"
Margin="0,0,0,20" />
<GridView Grid.Row="1"
x:Name="HomeGridView"
ItemsSource="{x:Bind HomeViewModel.HomeGridItems}"
ItemContainerStyle="{StaticResource GridViewItemStyle}"
IsItemClickEnabled="True"
SelectionMode="None"
ItemClick="HomeGridItemClickHandler">
<GridView.ItemTemplate>
<DataTemplate x:DataType="local:HomeGridItem">
<UserControl>
<Grid
x:Name="homeGridItemRoot"
Width="344"
Height="140"
Padding="12"
Background="{ThemeResource SystemControlBackgroundListLowBrush}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<RelativePanel Grid.Column="1" Grid.ColumnSpan="2" Margin="16,6,0,0">
<TextBlock
x:Name="titleText"
Style="{StaticResource SubheaderTextBlockStyle}"
Text="{x:Bind Title}"
Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
TextLineBounds="TrimToCapHeight"
TextWrapping="NoWrap" />
</RelativePanel>
</Grid>
</UserControl>
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
</Grid>
</Frame>
</ScrollViewer>
</Page>
39 changes: 20 additions & 19 deletions src/cascadia/TerminalSettingsEditor/Interaction.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,27 @@ the MIT License. See LICENSE in the project root for license information. -->
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:Controls="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d">

<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
<ScrollViewer>
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
Margin="0,12,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock x:Uid="Globals_Interaction"
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<TextBlock x:Uid="Globals_Interaction"
Style="{StaticResource SubheaderTextBlockStyle}"
Margin="0,0,0,20" />
<StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,100,0">
<CheckBox x:Uid="Globals_CopyOnSelect" IsChecked="{x:Bind GlobalSettings.CopyOnSelect, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<!--TODO: Converter Here-->
<!--<CheckBox x:Uid="Globals_CopyFormatting" IsChecked="{x:Bind GlobalSettings.CopyFormatting, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />-->
<TextBox x:Uid="Globals_WordDelimiters" Text="{x:Bind GlobalSettings.WordDelimiters, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_SnapToGridOnResize" IsChecked="{x:Bind GlobalSettings.SnapToGridOnResize, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
</StackPanel>
</Grid>
<StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,100,0">
<CheckBox x:Uid="Globals_CopyOnSelect" IsChecked="{x:Bind GlobalSettings.CopyOnSelect, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<!--TODO: Converter Here-->
<!--<CheckBox x:Uid="Globals_CopyFormatting" IsChecked="{x:Bind GlobalSettings.CopyFormatting, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />-->
<TextBox x:Uid="Globals_WordDelimiters" Text="{x:Bind GlobalSettings.WordDelimiters, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
<CheckBox x:Uid="Globals_SnapToGridOnResize" IsChecked="{x:Bind GlobalSettings.SnapToGridOnResize, Mode=TwoWay}" Margin="0,0,0,20" FontSize="15" ToolTipService.Placement="Mouse" />
</StackPanel>
</Grid>
</ScrollViewer>
</Page>
Loading