improve:计时器
This commit is contained in:
@@ -392,16 +392,18 @@
|
|||||||
<Grid Margin="0,0,0,20">
|
<Grid Margin="0,0,0,20">
|
||||||
<Border Background="{DynamicResource SeewoTimerWindowButtonBackground}"
|
<Border Background="{DynamicResource SeewoTimerWindowButtonBackground}"
|
||||||
CornerRadius="8"
|
CornerRadius="8"
|
||||||
|
BorderThickness="1"
|
||||||
|
BorderBrush="#B0B0B0"
|
||||||
Width="240" Height="40">
|
Width="240" Height="40">
|
||||||
<Grid>
|
<Grid>
|
||||||
<!-- 背景指示器 -->
|
<!-- 背景指示器 -->
|
||||||
<Border x:Name="SegmentedIndicator"
|
<Border x:Name="SegmentedIndicator"
|
||||||
Background="{DynamicResource SeewoTimerWindowPrimaryButtonBackground}"
|
Background="{DynamicResource SeewoTimerWindowPrimaryButtonBackground}"
|
||||||
CornerRadius="6"
|
CornerRadius="6,0,0,6"
|
||||||
Width="118" Height="32"
|
Width="120" Height="38"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Margin="2,0,0,0"/>
|
Margin="0,0,0,0"/>
|
||||||
|
|
||||||
<!-- 按钮容器 -->
|
<!-- 按钮容器 -->
|
||||||
<Grid>
|
<Grid>
|
||||||
|
|||||||
@@ -566,26 +566,30 @@ namespace Ink_Canvas
|
|||||||
CommonTimersGrid.Visibility = Visibility.Visible;
|
CommonTimersGrid.Visibility = Visibility.Visible;
|
||||||
RecentTimersGrid.Visibility = Visibility.Collapsed;
|
RecentTimersGrid.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
// 更新字体粗细和透明度
|
// 更新字体粗细、透明度和颜色
|
||||||
var commonText = this.FindName("CommonTabText") as TextBlock;
|
var commonText = this.FindName("CommonTabText") as TextBlock;
|
||||||
var recentText = this.FindName("RecentTabText") as TextBlock;
|
var recentText = this.FindName("RecentTabText") as TextBlock;
|
||||||
if (commonText != null)
|
if (commonText != null)
|
||||||
{
|
{
|
||||||
commonText.FontWeight = FontWeights.Bold;
|
commonText.FontWeight = FontWeights.Bold;
|
||||||
commonText.Opacity = 1.0;
|
commonText.Opacity = 1.0;
|
||||||
|
commonText.Foreground = new SolidColorBrush(Colors.White);
|
||||||
}
|
}
|
||||||
if (recentText != null)
|
if (recentText != null)
|
||||||
{
|
{
|
||||||
recentText.FontWeight = FontWeights.Normal;
|
recentText.FontWeight = FontWeights.Normal;
|
||||||
recentText.Opacity = 0.6;
|
recentText.Opacity = 0.8;
|
||||||
|
recentText.Foreground = new SolidColorBrush(Color.FromRgb(102, 102, 102));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 移动指示器到左侧
|
// 移动指示器到左侧
|
||||||
var indicator = this.FindName("SegmentedIndicator") as Border;
|
var indicator = this.FindName("SegmentedIndicator") as Border;
|
||||||
if (indicator != null)
|
if (indicator != null)
|
||||||
{
|
{
|
||||||
|
// 设置左侧圆角
|
||||||
|
indicator.CornerRadius = new CornerRadius(6, 0, 0, 6);
|
||||||
var animation = new System.Windows.Media.Animation.ThicknessAnimation(
|
var animation = new System.Windows.Media.Animation.ThicknessAnimation(
|
||||||
new Thickness(2, 0, 0, 0),
|
new Thickness(0, 0, 0, 0),
|
||||||
TimeSpan.FromMilliseconds(200));
|
TimeSpan.FromMilliseconds(200));
|
||||||
indicator.BeginAnimation(Border.MarginProperty, animation);
|
indicator.BeginAnimation(Border.MarginProperty, animation);
|
||||||
}
|
}
|
||||||
@@ -596,26 +600,30 @@ namespace Ink_Canvas
|
|||||||
CommonTimersGrid.Visibility = Visibility.Collapsed;
|
CommonTimersGrid.Visibility = Visibility.Collapsed;
|
||||||
RecentTimersGrid.Visibility = Visibility.Visible;
|
RecentTimersGrid.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
// 更新字体粗细和透明度
|
// 更新字体粗细、透明度和颜色
|
||||||
var commonText = this.FindName("CommonTabText") as TextBlock;
|
var commonText = this.FindName("CommonTabText") as TextBlock;
|
||||||
var recentText = this.FindName("RecentTabText") as TextBlock;
|
var recentText = this.FindName("RecentTabText") as TextBlock;
|
||||||
if (commonText != null)
|
if (commonText != null)
|
||||||
{
|
{
|
||||||
commonText.FontWeight = FontWeights.Normal;
|
commonText.FontWeight = FontWeights.Normal;
|
||||||
commonText.Opacity = 0.6;
|
commonText.Opacity = 0.8;
|
||||||
|
commonText.Foreground = new SolidColorBrush(Color.FromRgb(102, 102, 102));
|
||||||
}
|
}
|
||||||
if (recentText != null)
|
if (recentText != null)
|
||||||
{
|
{
|
||||||
recentText.FontWeight = FontWeights.Bold;
|
recentText.FontWeight = FontWeights.Bold;
|
||||||
recentText.Opacity = 1.0;
|
recentText.Opacity = 1.0;
|
||||||
|
recentText.Foreground = new SolidColorBrush(Colors.White);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 移动指示器到右侧
|
// 移动指示器到右侧
|
||||||
var indicator = this.FindName("SegmentedIndicator") as Border;
|
var indicator = this.FindName("SegmentedIndicator") as Border;
|
||||||
if (indicator != null)
|
if (indicator != null)
|
||||||
{
|
{
|
||||||
|
// 设置右侧圆角
|
||||||
|
indicator.CornerRadius = new CornerRadius(0, 6, 6, 0);
|
||||||
var animation = new System.Windows.Media.Animation.ThicknessAnimation(
|
var animation = new System.Windows.Media.Animation.ThicknessAnimation(
|
||||||
new Thickness(120, 0, 0, 0),
|
new Thickness(118, 0, 0, 0),
|
||||||
TimeSpan.FromMilliseconds(200));
|
TimeSpan.FromMilliseconds(200));
|
||||||
indicator.BeginAnimation(Border.MarginProperty, animation);
|
indicator.BeginAnimation(Border.MarginProperty, animation);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user