Skip to content

Commit 4bb6ea9

Browse files
committed
- Adjust Alignment and color
1 parent a8bdb34 commit 4bb6ea9

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

Flow.Launcher/MainWindow.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,12 @@
192192
</ContextMenu>
193193
</TextBox.ContextMenu>
194194
</TextBox>
195+
195196
<StackPanel x:Name="ClockPanel" Style="{DynamicResource ClockPanel}">
196197
<TextBlock x:Name="DateBox" Style="{DynamicResource DateBox}" />
197198
<TextBlock x:Name="ClockBox" Style="{DynamicResource ClockBox}" />
198-
199199
</StackPanel>
200+
200201
<Canvas Style="{DynamicResource SearchIconPosition}">
201202
<Image
202203
x:Name="PluginActivationIcon"

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ private void Timer_Tick(object sender, EventArgs e)
7171
{
7272
ClockBox.Visibility = Visibility.Collapsed;
7373
}
74-
if (_settings.UseDate == false)
74+
if (_settings.UseDate == true)
7575
{
7676
DateBox.Text = System.DateTime.Now.ToString("MM/dd ddd");
7777
}
78-
else if (_settings.UseDate == true)
78+
else if (_settings.UseDate == false)
7979
{
8080
DateBox.Visibility = Visibility.Collapsed;
8181
}

Flow.Launcher/Themes/Base.xaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@
7979
<Setter Property="Stroke" Value="Blue" />
8080
</Style>
8181

82+
<Style x:Key="BaseClockPosition" TargetType="{x:Type Canvas}" />
83+
8284
<Style x:Key="BaseClockPanel" TargetType="{x:Type StackPanel}">
8385
<Setter Property="Orientation" Value="Horizontal" />
8486
<Setter Property="HorizontalAlignment" Value="Right" />
@@ -88,29 +90,31 @@
8890
<Setter Property="Visibility" Value="Collapsed" />
8991
</Style>
9092
<Style x:Key="BaseClockBox" TargetType="{x:Type TextBlock}">
91-
<Setter Property="FontSize" Value="20" />
93+
<Setter Property="FontSize" Value="22" />
9294
<Setter Property="Foreground" Value="#8f8f8f" />
95+
<Setter Property="HorizontalAlignment" Value="Right" />
9396
<Setter Property="VerticalAlignment" Value="Center" />
94-
<Setter Property="Margin" Value="10,0,0,0" />
97+
<Setter Property="Margin" Value="0,0,2,0" />
9598
</Style>
9699
<Style x:Key="BaseDateBox" TargetType="{x:Type TextBlock}">
97-
<Setter Property="FontSize" Value="14" />
100+
<Setter Property="FontSize" Value="16" />
98101
<Setter Property="Foreground" Value="#8f8f8f" />
102+
<Setter Property="HorizontalAlignment" Value="Right" />
99103
<Setter Property="VerticalAlignment" Value="Center" />
100-
<Setter Property="Margin" Value="0,0,0,0" />
104+
<Setter Property="Margin" Value="0,0,10,0" />
101105
</Style>
102106

103107
<Style
104108
x:Key="ClockBox"
105109
BasedOn="{StaticResource BaseClockBox}"
106110
TargetType="{x:Type TextBlock}">
107-
<Setter Property="Foreground" Value="#8f8f8f" />
111+
<Setter Property="Foreground" Value="#C6C6C6" />
108112
</Style>
109113
<Style
110114
x:Key="DateBox"
111115
BasedOn="{StaticResource BaseDateBox}"
112116
TargetType="{x:Type TextBlock}">
113-
<Setter Property="Foreground" Value="#8f8f8f" />
117+
<Setter Property="Foreground" Value="#C6C6C6" />
114118
</Style>
115119
<Style
116120
x:Key="ClockPanel"

0 commit comments

Comments
 (0)