Skip to content

Commit

Permalink
update dismiss button style and controls
Browse files Browse the repository at this point in the history
  • Loading branch information
@United600
United600 committed Apr 23, 2024
1 parent 210bc80 commit badb564
Show file tree
Hide file tree
Showing 5 changed files with 114 additions and 113 deletions.
23 changes: 9 additions & 14 deletions src/Notepads/Controls/DiffViewer/SideBySideDiffViewer.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,21 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Background="{ThemeResource SystemControlForegroundTransparentBrush}"
mc:Ignorable="d">

<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="RightBoxBackgroundThemeBrush" Color="Black" Opacity="0.15" />
<SolidColorBrush x:Key="HeaderBackgroundThemeBrush" Color="Black" Opacity="0.2" />
<SolidColorBrush x:Key="RightBoxBackgroundThemeBrush" Color="{StaticResource SystemAltHighColor}" Opacity="0.15" />
<SolidColorBrush x:Key="HeaderBackgroundThemeBrush" Color="{StaticResource SystemAltHighColor}" Opacity="0.2" />
</ResourceDictionary>
<ResourceDictionary x:Key="Light">
<SolidColorBrush x:Key="RightBoxBackgroundThemeBrush" Color="White" Opacity="0.25" />
<SolidColorBrush x:Key="HeaderBackgroundThemeBrush" Color="LightGray" Opacity="0.35" />
<SolidColorBrush x:Key="RightBoxBackgroundThemeBrush" Color="{StaticResource SystemAltHighColor}" Opacity="0.25" />
<SolidColorBrush x:Key="HeaderBackgroundThemeBrush" Color="{StaticResource SystemBaseHighColor}" Opacity="0.05" />
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
<SolidColorBrush x:Key="RightBoxBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="RightBoxBackgroundThemeBrush" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="HeaderBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
Expand All @@ -33,28 +32,25 @@

<Grid Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="25" />
<RowDefinition Height="24" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<Grid Grid.Row="0" Background="{ThemeResource HeaderBackgroundThemeBrush}">
<Button x:Name="DismissButton"
Style="{StaticResource DismissButtonStyle}"
Width="32"
Height="25"
Padding="0"
Width="42"
Height="24"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Content="&#xE894;"
FontFamily="Segoe MDL2 Assets"
FontSize="12"
IsTabStop="False">
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Escape" />
</Button.KeyboardAccelerators>
</Button>
<TextBlock x:Uid="DiffViewer_Header_OldTextTittle"
Grid.Row="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
d:Text="Before your changes"
Expand All @@ -75,13 +71,12 @@

<Grid Grid.Column="1" Background="{ThemeResource RightBoxBackgroundThemeBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="25" />
<RowDefinition Height="24" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<Grid Grid.Row="0" Background="{ThemeResource HeaderBackgroundThemeBrush}">
<TextBlock x:Uid="DiffViewer_Header_NewTextTittle"
Grid.Row="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
d:Text="After your changes"
Expand Down
76 changes: 36 additions & 40 deletions src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
d:DesignWidth="340"
mc:Ignorable="d">

<Grid x:Name="FindAndReplaceRootGrid" KeyDown="FindAndReplaceRootGrid_KeyDown">
<Grid x:Name="FindAndReplaceRootGrid"
Padding="1,1,1,1"
KeyDown="FindAndReplaceRootGrid_KeyDown">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
Expand All @@ -21,19 +23,14 @@

<Grid x:Name="ToggleReplaceModeButtonGrid"
Grid.Row="0"
Grid.Column="0"
Height="36"
Padding="1,1,1,1">
Grid.Column="0">

<Button x:Name="ToggleReplaceModeButton"
x:Uid="FindAndReplace_ToggleReplaceModeButton"
Grid.Column="0"
Style="{StaticResource DismissButtonStyle}"
Width="20"
Padding="0"
Content="&#xE00F;"
MinHeight="32"
d:Content="&#xE76C;"
FontFamily="Segoe MDL2 Assets"
FontSize="12"
Click="ToggleReplaceModeButton_OnClick"
IsTabStop="False" />
Expand All @@ -42,8 +39,7 @@
<RelativePanel x:Name="FindBarPlaceHolder"
Grid.Row="0"
Grid.Column="1"
Height="36"
Padding="1,1,1,1">
Height="36">
<findAndReplace:FindAndReplaceTextBox x:Name="FindBar"
x:Uid="FindAndReplace_FindBar"
RelativePanel.AlignLeftWithPanel="True"
Expand All @@ -63,22 +59,23 @@
LostFocus="FindBar_LostFocus"
d:PlaceholderText="Find" />

<Grid x:Name="OptionButtonGrid"
RelativePanel.AlignRightWithPanel="True"
Background="Transparent">
<Border x:Name="OptionButtonSelectionIndicator"
BorderBrush="{StaticResource SystemControlBackgroundAccentBrush}"
BorderThickness="1"
Margin="9"
VerticalAlignment="Bottom"
Visibility="Collapsed"
d:Visibility="Visible" />
<Grid x:Name="OptionButtonGrid" RelativePanel.AlignRightWithPanel="True">
<Line x:Name="OptionButtonSelectionIndicator"
X1="9" Y1="24"
X2="23" Y2="24"
Stroke="{ThemeResource SystemControlHighlightAccentBrush}"
StrokeThickness="2"
StrokeStartLineCap="Round"
StrokeEndLineCap="Round"
Visibility="Collapsed"
d:Visibility="Visible"
IsHitTestVisible="False" />
<Button x:Name="OptionButton"
x:Uid="FindAndReplace_SearchOptionButton"
Style="{StaticResource DismissButtonStyle}"
Width="36"
Width="32"
Height="32"
Content="&#xE712;"
FontFamily="Segoe MDL2 Assets"
FontSize="16"
IsTabStop="False">
<Button.Flyout>
Expand All @@ -87,21 +84,21 @@
x:Uid="FindAndReplace_SearchOptionToggleButton_MatchCase"
Click="OptionButtonFlyoutItem_OnClick">
<ToggleMenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="C" Modifiers="Menu" />
<KeyboardAccelerator Modifiers="Menu" Key="C" />
</ToggleMenuFlyoutItem.KeyboardAccelerators>
</ToggleMenuFlyoutItem>
<ToggleMenuFlyoutItem x:Name="MatchWholeWordToggle"
x:Uid="FindAndReplace_SearchOptionToggleButton_MatchWholeWord"
Click="OptionButtonFlyoutItem_OnClick">
<ToggleMenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="W" Modifiers="Menu" />
<KeyboardAccelerator Modifiers="Menu" Key="W" />
</ToggleMenuFlyoutItem.KeyboardAccelerators>
</ToggleMenuFlyoutItem>
<ToggleMenuFlyoutItem x:Name="UseRegexToggle"
x:Uid="FindAndReplace_SearchOptionToggleButton_UseRegex"
Click="OptionButtonFlyoutItem_OnClick">
<ToggleMenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="E" Modifiers="Menu" />
<KeyboardAccelerator Modifiers="Menu" Key="E" />
</ToggleMenuFlyoutItem.KeyboardAccelerators>
</ToggleMenuFlyoutItem>
</MenuFlyout>
Expand All @@ -112,8 +109,8 @@

<Grid Grid.Row="0"
Grid.Column="2"
Height="36"
Padding="1,1,1,1">
Padding="2,0,0,0"
VerticalAlignment="Top">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
Expand All @@ -125,14 +122,14 @@
Grid.Column="0"
Style="{StaticResource DismissButtonStyle}"
Width="36"
Content="&#xE110;"
FontFamily="Segoe MDL2 Assets"
Height="32"
Content="&#xE74A;"
FontSize="16"
Click="SearchBackwardButton_OnClick"
IsEnabled="False"
IsTabStop="False">
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="F3" Modifiers="Shift" />
<KeyboardAccelerator Modifiers="Shift" Key="F3" />
</Button.KeyboardAccelerators>
</Button>

Expand All @@ -141,8 +138,8 @@
Grid.Column="1"
Style="{StaticResource DismissButtonStyle}"
Width="36"
Height="32"
Content="&#xE74B;"
FontFamily="Segoe MDL2 Assets"
FontSize="16"
Click="SearchForwardButton_OnClick"
IsEnabled="False"
Expand All @@ -157,8 +154,8 @@
Grid.Column="2"
Style="{StaticResource DismissButtonStyle}"
Width="36"
Height="32"
Content="&#xE894;"
FontFamily="Segoe MDL2 Assets"
FontSize="16"
Click="DismissButton_OnClick"
IsTabStop="False" />
Expand All @@ -167,8 +164,7 @@
<Grid x:Name="ReplaceBarPlaceHolder"
Grid.Row="1"
Grid.Column="1"
Height="36"
Padding="1,1,1,1">
VerticalAlignment="Top">
<findAndReplace:FindAndReplaceTextBox x:Name="ReplaceBar"
x:Uid="FindAndReplace_ReplaceBar"
Style="{StaticResource TransparentTextBoxStyle}"
Expand All @@ -188,8 +184,8 @@

<Grid Grid.Row="1"
Grid.Column="2"
Height="36"
Padding="1,1,1,1">
Padding="2,0,0,0"
VerticalAlignment="Top">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
Expand All @@ -201,14 +197,14 @@
Grid.Column="0"
Style="{StaticResource DismissButtonStyle}"
Width="36"
Height="32"
Content="&#xE8AB;"
FontFamily="Segoe MDL2 Assets"
FontSize="16"
Click="ReplaceButton_OnClick"
IsEnabled="False"
IsTabStop="False">
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="R" Modifiers="Menu" />
<KeyboardAccelerator Modifiers="Menu" Key="R" />
</Button.KeyboardAccelerators>
</Button>

Expand All @@ -217,14 +213,14 @@
Grid.Column="1"
Style="{StaticResource DismissButtonStyle}"
Width="36"
Height="32"
Content="&#xE7FD;"
FontFamily="Segoe MDL2 Assets"
FontSize="16"
Click="ReplaceAllButton_OnClick"
IsEnabled="False"
IsTabStop="False">
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Enter" Modifiers="Control,Menu" />
<KeyboardAccelerator Modifiers="Control,Menu" Key="Enter" />
</Button.KeyboardAccelerators>
</Button>
</Grid>
Expand Down
6 changes: 4 additions & 2 deletions src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ public void ShowReplaceBar(bool showReplaceBar)
if (showReplaceBar)
{
ToggleReplaceModeButtonGrid.SetValue(Grid.RowSpanProperty, 2);
ToggleReplaceModeButton.Content = new FontIcon { Glyph = "\xE011", FontSize = 12 };
ToggleReplaceModeButton.VerticalAlignment = VerticalAlignment.Stretch;
ToggleReplaceModeButton.Content = "\uE70D";
ReplaceBarPlaceHolder.Visibility = Visibility.Visible;
if (!string.IsNullOrEmpty(FindBar.Text))
{
Expand All @@ -127,7 +128,8 @@ public void ShowReplaceBar(bool showReplaceBar)
else
{
ToggleReplaceModeButtonGrid.SetValue(Grid.RowSpanProperty, 1);
ToggleReplaceModeButton.Content = new FontIcon { Glyph = "\xE00F", FontSize = 12 };
ToggleReplaceModeButton.VerticalAlignment = VerticalAlignment.Top;
ToggleReplaceModeButton.Content = "\uE76C";
ReplaceBarPlaceHolder.Visibility = Visibility.Collapsed;
ReplaceButton.IsEnabled = false;
ReplaceAllButton.IsEnabled = false;
Expand Down
49 changes: 25 additions & 24 deletions src/Notepads/Controls/GoTo/GoToControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Height="36"
d:DesignHeight="36"
d:DesignWidth="260"
mc:Ignorable="d">

Expand All @@ -20,38 +20,38 @@

<TextBlock x:Uid="GoTo_GoToBarLabel"
Grid.Column="0"
Margin="5,0,8,3"
Margin="6,0,8,5"
VerticalAlignment="Center"
d:Text="Go To:"
FontSize="15"
TextAlignment="Center" />
FontSize="15" />

<Grid Grid.Column="1">
<TextBox x:Name="GoToBar"
x:Uid="GoTo_GoToBar"
Style="{StaticResource TransparentTextBoxStyle}"
Foreground="{ThemeResource SystemControlHighlightChromeAltLowBrush}"
BorderThickness="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
FontSize="15"
TextAlignment="Left"
TextChanged="GoToBar_OnTextChanged"
BeforeTextChanging="GoToBar_BeforeTextChanging"
GotFocus="GoToBar_GotFocus"
IsSpellCheckEnabled="False"
KeyDown="GoToBar_OnKeyDown"
LostFocus="GoToBar_LostFocus"
d:PlaceholderText="Go To Line" />
</Grid>
<TextBox x:Name="GoToBar"
x:Uid="GoTo_GoToBar"
Grid.Column="1"
Style="{StaticResource TransparentTextBoxStyle}"
Foreground="{ThemeResource SystemControlHighlightChromeAltLowBrush}"
BorderThickness="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
FontSize="15"
TextAlignment="Left"
TextChanged="GoToBar_OnTextChanged"
BeforeTextChanging="GoToBar_BeforeTextChanging"
GotFocus="GoToBar_GotFocus"
InputScope="Number"
IsSpellCheckEnabled="False"
KeyDown="GoToBar_OnKeyDown"
LostFocus="GoToBar_LostFocus"
d:PlaceholderText="Go To Line" />

<Button x:Name="SearchButton"
x:Uid="GoTo_SearchButton"
Grid.Column="2"
Style="{StaticResource DismissButtonStyle}"
Width="36"
Height="32"
VerticalAlignment="Top"
Content="&#xEBE7;"
FontFamily="Segoe MDL2 Assets"
FontSize="16"
Visibility="Collapsed"
d:Visibility="Visible"
Expand All @@ -63,8 +63,9 @@
Grid.Column="3"
Style="{StaticResource DismissButtonStyle}"
Width="36"
Height="32"
VerticalAlignment="Top"
Content="&#xE894;"
FontFamily="Segoe MDL2 Assets"
FontSize="16"
Click="DismissButton_OnClick"
IsTabStop="False" />
Expand Down
Loading

0 comments on commit badb564

Please sign in to comment.