- Adjust Alignment and color

This commit is contained in:
DB p 2022-09-01 11:08:04 +09:00
parent a8bdb34c55
commit 4bb6ea92ec
3 changed files with 14 additions and 9 deletions

View file

@ -192,11 +192,12 @@
</ContextMenu> </ContextMenu>
</TextBox.ContextMenu> </TextBox.ContextMenu>
</TextBox> </TextBox>
<StackPanel x:Name="ClockPanel" Style="{DynamicResource ClockPanel}"> <StackPanel x:Name="ClockPanel" Style="{DynamicResource ClockPanel}">
<TextBlock x:Name="DateBox" Style="{DynamicResource DateBox}" /> <TextBlock x:Name="DateBox" Style="{DynamicResource DateBox}" />
<TextBlock x:Name="ClockBox" Style="{DynamicResource ClockBox}" /> <TextBlock x:Name="ClockBox" Style="{DynamicResource ClockBox}" />
</StackPanel> </StackPanel>
<Canvas Style="{DynamicResource SearchIconPosition}"> <Canvas Style="{DynamicResource SearchIconPosition}">
<Image <Image
x:Name="PluginActivationIcon" x:Name="PluginActivationIcon"

View file

@ -71,11 +71,11 @@ namespace Flow.Launcher
{ {
ClockBox.Visibility = Visibility.Collapsed; ClockBox.Visibility = Visibility.Collapsed;
} }
if (_settings.UseDate == false) if (_settings.UseDate == true)
{ {
DateBox.Text = System.DateTime.Now.ToString("MM/dd ddd"); DateBox.Text = System.DateTime.Now.ToString("MM/dd ddd");
} }
else if (_settings.UseDate == true) else if (_settings.UseDate == false)
{ {
DateBox.Visibility = Visibility.Collapsed; DateBox.Visibility = Visibility.Collapsed;
} }

View file

@ -79,6 +79,8 @@
<Setter Property="Stroke" Value="Blue" /> <Setter Property="Stroke" Value="Blue" />
</Style> </Style>
<Style x:Key="BaseClockPosition" TargetType="{x:Type Canvas}" />
<Style x:Key="BaseClockPanel" TargetType="{x:Type StackPanel}"> <Style x:Key="BaseClockPanel" TargetType="{x:Type StackPanel}">
<Setter Property="Orientation" Value="Horizontal" /> <Setter Property="Orientation" Value="Horizontal" />
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
@ -88,29 +90,31 @@
<Setter Property="Visibility" Value="Collapsed" /> <Setter Property="Visibility" Value="Collapsed" />
</Style> </Style>
<Style x:Key="BaseClockBox" TargetType="{x:Type TextBlock}"> <Style x:Key="BaseClockBox" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="20" /> <Setter Property="FontSize" Value="22" />
<Setter Property="Foreground" Value="#8f8f8f" /> <Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="10,0,0,0" /> <Setter Property="Margin" Value="0,0,2,0" />
</Style> </Style>
<Style x:Key="BaseDateBox" TargetType="{x:Type TextBlock}"> <Style x:Key="BaseDateBox" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="16" />
<Setter Property="Foreground" Value="#8f8f8f" /> <Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="0,0,0,0" /> <Setter Property="Margin" Value="0,0,10,0" />
</Style> </Style>
<Style <Style
x:Key="ClockBox" x:Key="ClockBox"
BasedOn="{StaticResource BaseClockBox}" BasedOn="{StaticResource BaseClockBox}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#8f8f8f" /> <Setter Property="Foreground" Value="#C6C6C6" />
</Style> </Style>
<Style <Style
x:Key="DateBox" x:Key="DateBox"
BasedOn="{StaticResource BaseDateBox}" BasedOn="{StaticResource BaseDateBox}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#8f8f8f" /> <Setter Property="Foreground" Value="#C6C6C6" />
</Style> </Style>
<Style <Style
x:Key="ClockPanel" x:Key="ClockPanel"