Readded Carriage - Moved Focus on enter/escape to Add Button - altered some background and foreground colors
This commit is contained in:
+27
-7
@@ -15,7 +15,8 @@
|
||||
ExtendClientAreaToDecorationsHint="True"
|
||||
CanResize="False"
|
||||
Topmost="True"
|
||||
Title="SimpleNote">
|
||||
Title="SimpleNote"
|
||||
>
|
||||
<Window.Styles>
|
||||
<Style Selector="TextBox">
|
||||
<Style Selector="^:focus">
|
||||
@@ -32,7 +33,7 @@
|
||||
</Style>
|
||||
</Style>
|
||||
</Window.Styles>
|
||||
<!--<Border CornerRadius="15" BorderBrush="White" BorderThickness="2" Background="#000000aa">-->
|
||||
<!-- <Border CornerRadius="7.5" BorderBrush="rgba(128, 128, 128, 0.6)" BorderThickness="2" Background="rgba(128, 128, 128, 0.3)"> -->
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<ExperimentalAcrylicBorder IsHitTestVisible="False">
|
||||
<ExperimentalAcrylicBorder.Material>
|
||||
@@ -44,7 +45,13 @@
|
||||
</ExperimentalAcrylicBorder.Material>
|
||||
</ExperimentalAcrylicBorder>
|
||||
<TextBox x:Name="FocusBox" IsVisible="False"/>
|
||||
<Button Margin="5,0" Command="{Binding AddButtonPressedCommand}" FontSize="{Binding FontSize}" Width="40" HorizontalContentAlignment="Center">
|
||||
<Button x:Name="AddButton" Margin="3,0"
|
||||
Command="{Binding AddButtonPressedCommand}"
|
||||
FontSize="{Binding FontSize}"
|
||||
Width="40" HorizontalContentAlignment="Center"
|
||||
Background="rgba(64, 64, 64, 0.6)"
|
||||
Foreground="White"
|
||||
>
|
||||
+
|
||||
</Button>
|
||||
<ItemsControl ItemsSource="{Binding Notes}">
|
||||
@@ -55,10 +62,15 @@
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate x:DataType="vm:Note">
|
||||
<Border CornerRadius="7.5" Margin="5,5,0,5" BorderBrush="Gray" BorderThickness="2" Background="Transparent">
|
||||
<Border CornerRadius="7.5"
|
||||
Margin="5,5,0,5"
|
||||
BorderBrush="rgba(0, 0, 0, 0.15)"
|
||||
BorderThickness="2"
|
||||
Background="rgba(64, 64, 64, 0.3)"
|
||||
>
|
||||
<StackPanel Margin="5" Background="Transparent" Orientation="Horizontal">
|
||||
<TextBox Height="20"
|
||||
CaretBrush="Transparent"
|
||||
CaretBrush="White"
|
||||
BorderThickness="0"
|
||||
Width="{Binding Width}"
|
||||
TextChanged="TextBox_OnTextChanged"
|
||||
@@ -78,7 +90,15 @@
|
||||
KeyDown="InputElement_OnKeyDown"
|
||||
>
|
||||
</TextBox>
|
||||
<Button Command="{Binding RemoveButtonClicked}" FontSize="{Binding FontSize}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="25" Padding="1,-3,0,0" Margin="5,0,0,0">
|
||||
<Button Command="{Binding RemoveButtonClicked}"
|
||||
FontSize="{Binding FontSize}"
|
||||
HorizontalContentAlignment="Center"
|
||||
VerticalContentAlignment="Center"
|
||||
Width="25"
|
||||
Padding="1,-3,0,0"
|
||||
Margin="5,0,0,0"
|
||||
Background="rgba(64, 64, 64, 0.3)"
|
||||
Foreground="White">
|
||||
x
|
||||
</Button>
|
||||
</StackPanel>
|
||||
@@ -87,5 +107,5 @@
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</StackPanel>
|
||||
<!--</Border>-->
|
||||
<!-- </Border> -->
|
||||
</Window>
|
||||
|
||||
Reference in New Issue
Block a user