Skip to content

Commit 2fd896b

Browse files
onesoundsonesounds
committed
- Remove Comment
- Add Hover Color
1 parent 2dfd1c3 commit 2fd896b

File tree

2 files changed

+26
-99
lines changed

2 files changed

+26
-99
lines changed

‎Flow.Launcher/Resources/CustomControlTemplate.xaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3230,4 +3230,26 @@
32303230

32313231
<ui:TextContextMenu x:Key="TextControlContextMenu" x:Shared="False" />
32323232

3233+
<!-- Text Button style for Plugin Area -->
3234+
<Style x:Key="LinkBtnStyle" TargetType="TextBlock">
3235+
<Setter Property="Foreground" Value="{DynamicResource PluginInfoColor}" />
3236+
<Setter Property="HorizontalAlignment" Value="Right" />
3237+
<Setter Property="VerticalAlignment" Value="Center" />
3238+
<Setter Property="Cursor" Value="Hand" />
3239+
<Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
3240+
<Setter Property="FontSize" Value="11" />
3241+
<Style.Triggers>
3242+
<Trigger Property="IsMouseOver" Value="True">
3243+
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
3244+
</Trigger>
3245+
</Style.Triggers>
3246+
</Style>
3247+
<Style x:Key="HyperLinkBtnStyle" TargetType="Hyperlink">
3248+
<Setter Property="Foreground" Value="{DynamicResource PluginInfoColor}" />
3249+
<Style.Triggers>
3250+
<Trigger Property="IsMouseOver" Value="True">
3251+
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
3252+
</Trigger>
3253+
</Style.Triggers>
3254+
</Style>
32333255
</ResourceDictionary>

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 4 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,6 @@
12831283
VerticalAlignment="Center"
12841284
Orientation="Horizontal"
12851285
Style="{StaticResource TextPanel}">
1286-
12871286
<TextBlock
12881287
Margin="10,0,0,0"
12891288
VerticalAlignment="center"
@@ -1316,138 +1315,44 @@
13161315
FontSize="11"
13171316
Foreground="{DynamicResource PluginInfoColor}"
13181317
Text="|" />
1319-
13201318
<TextBlock
13211319
Margin="5,0,0,0"
1322-
HorizontalAlignment="Right"
1323-
VerticalAlignment="Center"
1324-
Cursor="Hand"
1325-
FontFamily="/Resources/#Segoe Fluent Icons"
1326-
FontSize="11"
1327-
TextDecorations="None"
1320+
Style="{DynamicResource LinkBtnStyle}"
13281321
ToolTip="{DynamicResource plugin_query_web}">
13291322
<Hyperlink
1330-
Foreground="{DynamicResource PluginInfoColor}"
13311323
NavigateUri="{Binding PluginPair.Metadata.Website}"
13321324
RequestNavigate="OnRequestNavigate"
1325+
Style="{DynamicResource HyperLinkBtnStyle}"
13331326
TextDecorations="None">
1334-
<!--<Run Text="{DynamicResource plugin_query_web}" />-->
13351327
<Run Text="&#xe80f;" />
13361328
</Hyperlink>
13371329
</TextBlock>
1338-
13391330
<TextBlock
13401331
Margin="10,0,0,0"
1341-
HorizontalAlignment="Right"
1342-
VerticalAlignment="Center"
1343-
Cursor="Hand"
1344-
FontFamily="/Resources/#Segoe Fluent Icons"
1345-
FontSize="11"
1346-
Foreground="{DynamicResource PluginInfoColor}"
13471332
MouseUp="OnExternalPluginUninstallClick"
1333+
Style="{DynamicResource LinkBtnStyle}"
13481334
Text="&#xe74d;"
1349-
TextDecorations="None"
13501335
ToolTip="{DynamicResource plugin_uninstall}" />
1351-
13521336
<TextBlock
13531337
Margin="10,0,5,0"
1354-
HorizontalAlignment="Right"
1355-
VerticalAlignment="Center"
1356-
Cursor="Hand"
1357-
FontFamily="/Resources/#Segoe Fluent Icons"
1358-
FontSize="11"
1359-
Foreground="{DynamicResource PluginInfoColor}"
1338+
Style="{DynamicResource LinkBtnStyle}"
13601339
Text="&#xe8b7;"
13611340
ToolTip="{DynamicResource pluginDirectory}">
13621341
<TextBlock.InputBindings>
13631342
<MouseBinding Command="{Binding OpenPluginDirectoryCommand}" MouseAction="LeftClick" />
13641343
</TextBlock.InputBindings>
13651344
</TextBlock>
1366-
<!--
1367-
<TextBlock
1368-
Margin="5,0,0,0"
1369-
FontSize="11"
1370-
Foreground="{DynamicResource PluginInfoColor}"
1371-
Text="{DynamicResource plugin_init_time}" />
1372-
<TextBlock
1373-
MaxWidth="100"
1374-
Margin="5,0,0,0"
1375-
FontSize="11"
1376-
Foreground="{DynamicResource PluginInfoColor}"
1377-
Text="{Binding InitilizaTime}" />
1378-
<TextBlock
1379-
Margin="5,0,0,0"
1380-
VerticalAlignment="Center"
1381-
FontSize="11"
1382-
Foreground="{DynamicResource PluginInfoColor}"
1383-
Text="|" />
1384-
<TextBlock
1385-
Margin="5,0,0,0"
1386-
FontSize="11"
1387-
Foreground="{DynamicResource PluginInfoColor}"
1388-
Text="{DynamicResource plugin_query_time}" />
1389-
<TextBlock
1390-
Margin="5,0,0,0"
1391-
FontSize="11"
1392-
Foreground="{DynamicResource PluginInfoColor}"
1393-
Text="{Binding QueryTime}" />
1394-
-->
1395-
<!--
1396-
<Button
1397-
Margin="0,0,0,0"
1398-
Background="Transparent"
1399-
BorderThickness="0"
1400-
Content="&#xe712;"
1401-
FontFamily="/Resources/#Segoe Fluent Icons"
1402-
FontSize="11"
1403-
Foreground="{DynamicResource PluginInfoColor}"
1404-
Style="{DynamicResource DefaultNonBDButtonStyle}">
1405-
<ui:FlyoutService.Flyout>
1406-
<ui:MenuFlyout>
1407-
<MenuItem Click="OpenWelcomeWindow" Header="{DynamicResource plugin_query_web}">
1408-
<MenuItem.Icon>
1409-
<ui:FontIcon Glyph="&#xe939;" />
1410-
</MenuItem.Icon>
1411-
</MenuItem>
1412-
<MenuItem Click="OpenSettingFolder" Header="{DynamicResource plugin_uninstall}">
1413-
<MenuItem.Icon>
1414-
<ui:FontIcon Glyph="&#xe8b7;" />
1415-
</MenuItem.Icon>
1416-
</MenuItem>
1417-
<MenuItem Click="OpenLogFolder" Header="{DynamicResource pluginDirectory}">
1418-
<MenuItem.Icon>
1419-
<ui:FontIcon Glyph="&#xe8b7;" />
1420-
</MenuItem.Icon>
1421-
</MenuItem>
1422-
<MenuItem Click="OpenLogFolder" Header="{DynamicResource pluginDirectory}">
1423-
<MenuItem.Icon>
1424-
<ui:FontIcon Glyph="&#xe8b7;" />
1425-
</MenuItem.Icon>
1426-
</MenuItem>
1427-
<MenuItem Click="OpenLogFolder" Header="{DynamicResource pluginDirectory}">
1428-
<MenuItem.Icon>
1429-
<ui:FontIcon Glyph="&#xe8b7;" />
1430-
</MenuItem.Icon>
1431-
</MenuItem>
1432-
</ui:MenuFlyout>
1433-
</ui:FlyoutService.Flyout>
1434-
</Button>
1435-
-->
14361345
</StackPanel>
1437-
14381346
</ItemsControl>
14391347
</Border>
1440-
14411348
</StackPanel>
14421349
</StackPanel>
14431350
</Grid>
14441351
</Expander>
1445-
14461352
</DataTemplate>
14471353
</ListBox.ItemTemplate>
14481354
</ListBox>
14491355
</Border>
1450-
14511356
</Grid>
14521357
</TabItem>
14531358

0 commit comments

Comments
 (0)