Skip to content

Feature: Adjust tooltip for apps, cleanup scrollviewer #2716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
May 20, 2024
Merged

Feature: Adjust tooltip for apps, cleanup scrollviewer #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ad977e
Feature: Adjust tooltip for apps, cleanup scrollviewer
BornToBeRoot May 20, 2024
c80d63b
Docs: #2716
BornToBeRoot May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Source/NETworkManager.Localization/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Source/NETworkManager.Localization/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3817,4 +3817,10 @@ Try again in a few seconds.</value>
<data name="ProfileFiles" xml:space="preserve">
<value>Profile files</value>
</data>
<data name="OpenSettingsDots" xml:space="preserve">
<value>Open settings...</value>
</data>
<data name="ExpandAndOpenSearchDots" xml:space="preserve">
<value>Expand and open search...</value>
</data>
</root>
2 changes: 1 addition & 1 deletion Source/NETworkManager/CommandLineWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
Style="{StaticResource DefaultTextBlock}" Margin="0,0,0,10" />
<Border Grid.Row="2" BorderBrush="{DynamicResource MahApps.Brushes.Gray8}" BorderThickness="1"
Margin="0,0,0,10" Padding="5">
<ScrollViewer Style="{StaticResource DefaultScrollViewer}" HorizontalScrollBarVisibility="Disabled">
<ScrollViewer HorizontalScrollBarVisibility="Disabled">
<Grid>
<Grid.Resources>
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
Expand Down
68 changes: 34 additions & 34 deletions Source/NETworkManager/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<converters:ApplicationNameToTranslatedStringConverter x:Key="ApplicationNameToTranslatedStringConverter" />
<converters:ApplicationNameToIconConverter x:Key="ApplicationNameToIconConverter" />
<converters:IntZeroToVisibilityCollapsedConverter x:Key="IntZeroToVisibilityCollapsedConverter" />
<converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter"/>
<converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
<!-- ReSharper disable once Xaml.RedundantResource - Used in TrayIcon -->
<ContextMenu x:Key="ContextMenuNotifyIcon" MinWidth="200" Opened="ContextMenu_Opened" x:Shared="False">
<MenuItem Header="{x:Static localization:Strings.Show}" Command="{Binding ShowWindowCommand}">
Expand Down Expand Up @@ -103,36 +103,6 @@
</Rectangle>
</StackPanel>
</Button>
<!-- ToDo: CenterWindowCommands https://github.com/MahApps/MahApps.Metro/issues/4419 -->
<!--
<Button Command="{Binding Path=OpenRunCommand}"
Cursor="Hand"
Visibility="{Binding Path=FlyoutRunCommandIsOpen, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityCollapsedConverter}}"
Style="{StaticResource ResourceKey=CleanButton}"
Margin="0,0,10,0">
<Grid Height="30">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="270" />
</Grid.ColumnDefinitions>
<Rectangle Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"
Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray10}" />
<Rectangle Grid.Column="0" Grid.Row="0"
Margin="5,0"
Width="20" Height="20"
HorizontalAlignment="Right"
Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray8}">
<Rectangle.OpacityMask>
<VisualBrush Stretch="Uniform" Visual="{iconPacks:FontAwesome Kind=TerminalSolid}" />
</Rectangle.OpacityMask>
</Rectangle>

<TextBlock Grid.Column="1" Grid.Row="0"
Style="{StaticResource ResourceKey=InfoTextBlock}"
Text="{x:Static Member=localization:Strings.Watermark_RunCommandWithHotKey}" />
</Grid>
</Button>
-->
<Button Command="{Binding RestartApplicationCommand}"
Opacity="1"
Visibility="{Binding IsRestartRequired, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
Expand Down Expand Up @@ -431,7 +401,7 @@
</Grid.RowDefinitions>
<Button Grid.Column="0" Grid.Row="0"
Command="{Binding OpenApplicationListCommand}"
ToolTip="{x:Static localization:Strings.Search}"
ToolTip="{x:Static localization:Strings.ExpandAndOpenSearchDots}"
Focusable="False">
<Button.Style>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
Expand Down Expand Up @@ -638,11 +608,41 @@
BorderThickness="0">
<ListView.ItemTemplate>
<DataTemplate DataType="{x:Type models:ApplicationInfo}">
<Grid Height="48">
<Grid Height="48" Background="Transparent"
ToolTipService.InitialShowDelay="500"
ToolTipService.IsEnabled="True">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="48" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.Resources>
<Style TargetType="{x:Type ToolTip}">
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="HasDropShadow" Value="True" />
<Setter Property="Placement" Value="Right" />
<!--Offset to the arrow path-->
<Setter Property="HorizontalOffset" Value="10" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToolTip}">
<Grid Height="36" Margin="0,6">
<Border x:Name="border"
CornerRadius="3"
BorderThickness="1"
BorderBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray8}"
Background="{DynamicResource ResourceKey=MahApps.Brushes.Window.Background}">
<TextBlock Text="{TemplateBinding Content}"
VerticalAlignment="Center"
Margin="10,0,10,0"
FontSize="14"
Foreground="{DynamicResource MahApps.Brushes.Text}" />
</Border>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</Grid.Resources>
<Grid.Style>
<Style TargetType="{x:Type Grid}">
<Setter Property="ToolTip"
Expand Down Expand Up @@ -863,7 +863,7 @@
Command="{Binding OpenSettingsCommand}">
<Button.Style>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource SettingsButton}">
<Setter Property="ToolTip" Value="{x:Static localization:Strings.Settings}" />
<Setter Property="ToolTip" Value="{x:Static localization:Strings.OpenSettingsDots}" />
<Style.Triggers>
<DataTrigger
Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=DataContext.ApplicationViewIsExpanded}"
Expand Down
3 changes: 0 additions & 3 deletions Source/NETworkManager/Resources/Styles/ComboBoxStyles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls">
<Style x:Key="DefaultComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource MahApps.Styles.ComboBox}">
<Style.Resources>
<Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource DefaultScrollViewer}" />
</Style.Resources>
<Setter Property="FontSize" Value="14" />
<!--<Setter Property="BorderThickness" Value="0,0,0,1" />-->
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray8}" />
Expand Down
3 changes: 0 additions & 3 deletions Source/NETworkManager/Resources/Styles/ListBoxStyle.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="DefaultListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource MahApps.Styles.ListBox}">
<Style.Resources>
<Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource DefaultScrollViewer}" />
</Style.Resources>
<Setter Property="FontSize" Value="14" />
</Style>

Expand Down
66 changes: 5 additions & 61 deletions Source/NETworkManager/Resources/Styles/ScrollBarStyles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="DefaultScrollBar" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MahApps.Styles.ScrollBar}">
<Style.Triggers>
<Trigger Property="Orientation" Value="Horizontal">
Expand All @@ -11,68 +10,13 @@
<Setter Property="Width" Value="8" />
<Setter Property="Height" Value="Auto" />
</Trigger>
</Style.Triggers>
</Style>

<Style x:Key="ScrollViewerScrollBar" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DefaultScrollBar}">
<Style.Triggers>
<DataTrigger
Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ScrollViewer}}, Path=IsMouseOver}"
Value="False">
<Setter Property="Opacity" Value="0.5" />
</DataTrigger>
</Style.Triggers>
</Style>

<Style x:Key="ListViewScrollBar" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DefaultScrollBar}">
<Style.Triggers>
<DataTrigger
Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListView}}, Path=IsMouseOver}"
Value="False">
<Setter Property="Opacity" Value="0.5" />
</DataTrigger>
</Style.Triggers>
</Style>

<Style x:Key="TextBoxScrollBar" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DefaultScrollBar}">
<Style.Triggers>
<DataTrigger
Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type TextBox}}, Path=IsMouseOver}"
Value="False">
<Setter Property="Opacity" Value="0.5" />
</DataTrigger>
</Style.Triggers>
</Style>

<Style x:Key="DataGridScrollBar" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DefaultScrollBar}">
<Style.Triggers>
<DataTrigger
Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}, Path=IsMouseOver}"
Value="False">
<Setter Property="Opacity" Value="0.5" />
</DataTrigger>
</Style.Triggers>
</Style>

<Style x:Key="MultiSelectDataGridScrollBar" TargetType="{x:Type ScrollBar}"
BasedOn="{StaticResource DefaultScrollBar}">
<Style.Triggers>
<DataTrigger
Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type controls:MultiSelectDataGrid}}, Path=IsMouseOver}"
Value="False">
<Setter Property="Opacity" Value="0.5" />
</DataTrigger>
</Style.Triggers>
</Style>

<Style x:Key="ScrollingDataGridScrollBar" TargetType="{x:Type ScrollBar}"
BasedOn="{StaticResource DefaultScrollBar}">
<Style.Triggers>
<DataTrigger
Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type controls:MultiSelectScrollingDataGrid}}, Path=IsMouseOver}"
Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
Value="False">
<Setter Property="Opacity" Value="0.5" />
<Setter Property="Opacity" Value="0.25" />
</DataTrigger>
</Style.Triggers>
</Style>

<Style TargetType="{x:Type TypeName=ScrollBar}" BasedOn="{StaticResource ResourceKey=DefaultScrollBar}" />
</ResourceDictionary>
25 changes: 12 additions & 13 deletions Source/NETworkManager/Resources/Styles/ScrollViewerStyles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
Maximum="{TemplateBinding ScrollableHeight}"
ViewportSize="{TemplateBinding ViewportHeight}"
Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
Style="{StaticResource ScrollViewerScrollBar}"
Margin="10,0,0,0" />
<ScrollBar x:Name="PART_HorizontalScrollBar"
Grid.Row="1"
Expand All @@ -36,14 +35,15 @@
ViewportSize="{TemplateBinding ViewportWidth}"
Orientation="Horizontal"
Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
Style="{StaticResource ScrollViewerScrollBar}"
Margin="0,10,0,0" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>

<Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource DefaultScrollViewer}" />

<Style x:Key="FadeOutScrollViewer" TargetType="{x:Type ScrollViewer}"
BasedOn="{StaticResource MahApps.Styles.ScrollViewer}">
<Setter Property="VerticalScrollBarVisibility" Value="Hidden" />
Expand All @@ -60,25 +60,24 @@
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<ScrollContentPresenter Grid.ColumnSpan="2" Grid.RowSpan="2" />
<ScrollContentPresenter Grid.Column="0" Grid.Row="0"
Grid.ColumnSpan="2" Grid.RowSpan="2" />
<ScrollBar Name="PART_VerticalScrollBar"
HorizontalAlignment="Right"
Grid.Row="0"
Grid.Column="1"
Value="{TemplateBinding VerticalOffset}"
Maximum="{TemplateBinding ScrollableHeight}"
ViewportSize="{TemplateBinding ViewportHeight}"
Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
Style="{StaticResource ScrollViewerScrollBar}" />
Value="{TemplateBinding Property=VerticalOffset}"
Maximum="{TemplateBinding Property=ScrollableHeight}"
ViewportSize="{TemplateBinding Property=ViewportHeight}"
Visibility="{TemplateBinding Property=ComputedVerticalScrollBarVisibility}" />
<ScrollBar x:Name="PART_HorizontalScrollBar"
Grid.Row="1"
Grid.Column="0"
Value="{TemplateBinding HorizontalOffset}"
Maximum="{TemplateBinding ScrollableWidth}"
ViewportSize="{TemplateBinding ViewportWidth}"
Value="{TemplateBinding Property=HorizontalOffset}"
Maximum="{TemplateBinding Property=ScrollableWidth}"
ViewportSize="{TemplateBinding Property=ViewportWidth}"
Orientation="Horizontal"
Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
Style="{StaticResource ScrollViewerScrollBar}" />
Visibility="{TemplateBinding Property=ComputedHorizontalScrollBarVisibility}"/>
</Grid>
</ControlTemplate>
</Setter.Value>
Expand Down
Loading