Skip to content

Commit cfea395

Browse files
Chill-AstroChill-Astro
committed
Updated Files for v11.26100.4.0
1 parent bed73d7 commit cfea395

File tree

3 files changed

+90
-66
lines changed

3 files changed

+90
-66
lines changed

‎App.xaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@
1010
<ResourceDictionary Source="/Styles/Thickness.xaml" />
1111
<ResourceDictionary Source="/Styles/TextBlock.xaml" />
1212
</ResourceDictionary.MergedDictionaries>
13-
1413
<ResourceDictionary.ThemeDictionaries>
1514
<ResourceDictionary x:Key="Light">
1615
<SolidColorBrush x:Key="AccentButtonBackground" Color="{ThemeResource SystemAccentColorDark1}"/>
16+
<SolidColorBrush x:Key="AccentButtonHoverBackground" Color="{ThemeResource SystemAccentColorDark2}"/>
17+
<SolidColorBrush x:Key="AccentButtonPressedBackground" Color="{ThemeResource SystemAccentColorDark3}"/>
1718
<SolidColorBrush x:Key="AccentButtonForeground" Color="Black"/>
1819
</ResourceDictionary>
19-
2020
<ResourceDictionary x:Key="Dark">
2121
<SolidColorBrush x:Key="AccentButtonBackground" Color="{ThemeResource SystemAccentColorLight3}"/>
22+
<SolidColorBrush x:Key="AccentButtonHoverBackground" Color="{ThemeResource SystemAccentColorLight3}"/>
23+
<SolidColorBrush x:Key="AccentButtonPressedBackground" Color="{ThemeResource SystemAccentColorLight1}"/>
2224
<SolidColorBrush x:Key="AccentButtonForeground" Color="White"/>
2325
</ResourceDictionary>
2426
</ResourceDictionary.ThemeDictionaries>

‎Package.appxmanifest‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Identity
1515
Name="Chill-Astro.Calculator"
1616
Publisher="CN=Chill-Astro"
17-
Version="11.26100.3.0" />
17+
Version="11.26100.4.0" />
1818

1919
<mp:PhoneIdentity PhoneProductId="6c8aa7e5-3e67-4adf-84f4-6a719630cdb3" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
2020

@@ -63,6 +63,8 @@
6363
<uap5:ExecutionAlias Alias="wincalc.exe" />
6464
<uap5:ExecutionAlias Alias="calc+.exe" />
6565
<uap5:ExecutionAlias Alias="cac.exe" />
66+
<uap5:ExecutionAlias Alias="calcx.exe" />
67+
<uap5:ExecutionAlias Alias="calcx-11.exe" />
6668
</uap5:AppExecutionAlias>
6769
</uap5:Extension>
6870
</Extensions>

‎Views/CalculatorPage.xaml‎

Lines changed: 83 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -10,106 +10,126 @@
1010
Loaded="CalculatorPage_Loaded">
1111
<Page.Resources>
1212
<Style TargetType="Button" x:Key="CalculatorButtonStyle">
13-
<Setter Property="Background" Value="{ThemeResource ButtonBackground}" />
14-
<Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
15-
<Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}" />
16-
<Setter Property="BorderThickness" Value="1" />
13+
<Setter Property="Background" Value="{ThemeResource ButtonBackground}"/>
14+
<Setter Property="Foreground" Value="{ThemeResource ButtonForeground}"/>
15+
<Setter Property="BorderThickness" Value="1"/>
1716
<Setter Property="Padding" Value="2"/>
1817
<Setter Property="Margin" Value="5"/>
1918
<Setter Property="CornerRadius" Value="7"/>
20-
<Setter Property="FontWeight" Value="Normal" />
21-
<Setter Property="FontSize" Value="20" />
22-
<Setter Property="HorizontalContentAlignment" Value="Center" />
19+
<Setter Property="FontWeight" Value="Normal"/>
20+
<Setter Property="FontSize" Value="20"/>
21+
<Setter Property="HorizontalContentAlignment" Value="Center"/>
2322
<Setter Property="HorizontalAlignment" Value="Stretch"/>
24-
<Setter Property="VerticalContentAlignment" Value="Center" />
23+
<Setter Property="VerticalContentAlignment" Value="Center"/>
2524
<Setter Property="VerticalAlignment" Value="Stretch"/>
26-
<Setter Property="MinWidth" Value="55" />
25+
<Setter Property="MinWidth" Value="55"/>
2726
<Setter Property="MinHeight" Value="40"/>
2827
<Setter Property="Template">
2928
<Setter.Value>
3029
<ControlTemplate TargetType="Button">
31-
<Grid>
30+
<Border x:Name="OuterBorder" Background="Transparent">
31+
<VisualStateManager.VisualStateGroups>
32+
<VisualStateGroup x:Name="CommonStates">
33+
<VisualState x:Name="Normal"/>
34+
<VisualState x:Name="PointerOver">
35+
<Storyboard>
36+
<ColorAnimation Duration="0"
37+
Storyboard.TargetName="Border"
38+
Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
39+
To="#05AAAAAA"/>
40+
</Storyboard>
41+
</VisualState>
42+
<VisualState x:Name="Pressed">
43+
<Storyboard>
44+
<ColorAnimation Duration="0"
45+
Storyboard.TargetName="Border"
46+
Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
47+
To="#07888888"/>
48+
<DoubleAnimation Duration="0:0:0.1"
49+
Storyboard.TargetName="ScaleTransform"
50+
Storyboard.TargetProperty="ScaleX"/>
51+
<DoubleAnimation Duration="0:0:0.1"
52+
Storyboard.TargetName="ScaleTransform"
53+
Storyboard.TargetProperty="ScaleY"/>
54+
</Storyboard>
55+
</VisualState>
56+
</VisualStateGroup>
57+
</VisualStateManager.VisualStateGroups>
3258
<Border x:Name="Border"
33-
Background="{TemplateBinding Background}"
34-
BorderBrush="{TemplateBinding BorderBrush}"
35-
BorderThickness="1"
36-
CornerRadius="{TemplateBinding CornerRadius}">
37-
<VisualStateManager.VisualStateGroups>
38-
<VisualStateGroup x:Name="CommonStates">
39-
<VisualState x:Name="Normal"/>
40-
<VisualState x:Name="PointerOver">
41-
<Storyboard>
42-
<ColorAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="DarkSlateGray" Duration="0:0:0.2"/>
43-
</Storyboard>
44-
</VisualState>
45-
<VisualState x:Name="Pressed">
46-
<Storyboard>
47-
<ColorAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="DimGray" Duration="0:0:0.2"/>
48-
</Storyboard>
49-
</VisualState>
50-
</VisualStateGroup>
51-
</VisualStateManager.VisualStateGroups>
59+
Background="{TemplateBinding Background}"
60+
BorderBrush="{TemplateBinding BorderBrush}"
61+
BorderThickness="{TemplateBinding BorderThickness}"
62+
CornerRadius="{TemplateBinding CornerRadius}">
5263
<Border.RenderTransform>
5364
<ScaleTransform x:Name="ScaleTransform" ScaleX="1" ScaleY="1"/>
5465
</Border.RenderTransform>
66+
<ContentPresenter x:Name="ContentPresenter"
67+
ContentTemplate="{TemplateBinding ContentTemplate}"
68+
Content="{TemplateBinding Content}"
69+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
70+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
71+
Margin="{TemplateBinding Padding}"/>
5572
</Border>
56-
<ContentPresenter x:Name="ContentPresenter"
57-
ContentTemplate="{TemplateBinding ContentTemplate}"
58-
Content="{TemplateBinding Content}"
59-
ContentTransitions="{TemplateBinding ContentTransitions}"
60-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
61-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
62-
Margin="{TemplateBinding Padding}"/>
63-
</Grid>
73+
</Border>
6474
</ControlTemplate>
6575
</Setter.Value>
6676
</Setter>
6777
</Style>
78+
6879
<Style TargetType="Button" x:Key="NumberButtonStyle" BasedOn="{StaticResource CalculatorButtonStyle}">
80+
<Setter Property="Background" Value="{ThemeResource ButtonBackground}"/>
6981
<Setter Property="BorderThickness" Value="1"/>
7082
<Setter Property="FontWeight" Value="Normal"/>
7183
<Setter Property="FontSize" Value="20"/>
7284
<Setter Property="CornerRadius" Value="7"/>
7385
</Style>
86+
7487
<Style TargetType="Button" x:Key="AccentButtonStyle" BasedOn="{StaticResource CalculatorButtonStyle}">
88+
<Setter Property="Background" Value="{ThemeResource AccentButtonBackground}"/>
89+
<Setter Property="Foreground" Value="{ThemeResource AccentButtonForeground}"/>
7590
<Setter Property="BorderThickness" Value="1"/>
7691
<Setter Property="FontWeight" Value="Normal"/>
7792
<Setter Property="CornerRadius" Value="7"/>
7893
<Setter Property="FontSize" Value="20"/>
7994
<Setter Property="Template">
8095
<Setter.Value>
8196
<ControlTemplate TargetType="Button">
82-
<Grid>
97+
<Border x:Name="OuterBorder" Background="Transparent">
98+
<VisualStateManager.VisualStateGroups>
99+
<VisualStateGroup x:Name="CommonStates">
100+
<VisualState x:Name="Normal"/>
101+
<VisualState x:Name="PointerOver">
102+
<Storyboard>
103+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="Background">
104+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource AccentButtonHoverBackground}"/>
105+
</ObjectAnimationUsingKeyFrames>
106+
</Storyboard>
107+
</VisualState>
108+
<VisualState x:Name="Pressed">
109+
<Storyboard>
110+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="Background">
111+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource AccentButtonPressedBackground}"/>
112+
</ObjectAnimationUsingKeyFrames>
113+
</Storyboard>
114+
</VisualState>
115+
</VisualStateGroup>
116+
</VisualStateManager.VisualStateGroups>
83117
<Border x:Name="Border"
84-
Background="{TemplateBinding Background}"
85-
CornerRadius="{TemplateBinding CornerRadius}"
86-
BorderThickness="{TemplateBinding BorderThickness}">
87-
<VisualStateManager.VisualStateGroups>
88-
<VisualStateGroup x:Name="CommonStates">
89-
<VisualState x:Name="Normal"/>
90-
<VisualState x:Name="PointerOver">
91-
<Storyboard>
92-
<ColorAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="DarkSlateGray" Duration="0:0:0.2"/>
93-
</Storyboard>
94-
</VisualState>
95-
<VisualState x:Name="Pressed">
96-
<Storyboard>
97-
<ColorAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="DimGray" Duration="0:0:0.2"/>
98-
</Storyboard>
99-
</VisualState>
100-
</VisualStateGroup>
101-
</VisualStateManager.VisualStateGroups>
102-
<Border.RenderTransform>
103-
<ScaleTransform x:Name="ScaleTransform" ScaleX="1" ScaleY="1"/>
104-
</Border.RenderTransform>
105-
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
118+
Background="{TemplateBinding Background}"
119+
BorderBrush="{TemplateBinding BorderBrush}"
120+
BorderThickness="{TemplateBinding BorderThickness}"
121+
CornerRadius="{TemplateBinding CornerRadius}">
122+
<ContentPresenter x:Name="ContentPresenter"
123+
ContentTemplate="{TemplateBinding ContentTemplate}"
124+
Content="{TemplateBinding Content}"
125+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
126+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
127+
Margin="{TemplateBinding Padding}"/>
106128
</Border>
107-
</Grid>
129+
</Border>
108130
</ControlTemplate>
109131
</Setter.Value>
110132
</Setter>
111-
<Setter Property="Background" Value="{ThemeResource AccentButtonBackground}"/>
112-
<Setter Property="Foreground" Value="{ThemeResource AccentButtonForeground}"/>
113133
</Style>
114134
</Page.Resources>
115135
<Grid x:Name="ContentGrid" Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RenderTransformOrigin="0.5,0.5">

0 commit comments

Comments
 (0)