Skip to content

Commit bc08e6e

Browse files
CyLuGhCyLuGh
committed
Avalonia: fix tooltip position when changing scale
1 parent c475f66 commit bc08e6e

9 files changed

Lines changed: 24 additions & 29 deletions

File tree

‎src/Demo.AvaloniaApplication.Desktop/Demo.AvaloniaApplication.Desktop.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
15-
<PackageReference Include="System.Text.Json" Version="10.0.0" />
14+
<PackageReference Include="Avalonia.Desktop" Version="11.3.10" />
15+
<PackageReference Include="System.Text.Json" Version="10.0.1" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Demo.AvaloniaApplication/Demo.AvaloniaApplication.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net9.0</TargetFramework>
44
<Nullable>enable</Nullable>
@@ -14,17 +14,17 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Avalonia" Version="11.3.8" />
18-
<PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
19-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
20-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8" />
17+
<PackageReference Include="Avalonia" Version="11.3.10" />
18+
<PackageReference Include="Avalonia.Desktop" Version="11.3.10" />
19+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.10" />
20+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.10" />
2121
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
22-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.8" />
22+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.10" />
2323
<PackageReference Include="Splat.DependencyInjection.SourceGenerator" Version="1.2.3">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>
27-
<PackageReference Include="System.Text.Json" Version="10.0.0" />
27+
<PackageReference Include="System.Text.Json" Version="10.0.1" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/Demo/Demo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Bogus" Version="35.6.5" />
21-
<PackageReference Include="NLog" Version="6.0.6" />
22-
<PackageReference Include="Splat.NLog" Version="17.1.1" />
21+
<PackageReference Include="NLog" Version="6.0.7" />
22+
<PackageReference Include="Splat.NLog" Version="19.1.1" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/HierarchyGrid.Avalonia/Grid.axaml.cs‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ CompositeDisposable disposables
146146
viewModel
147147
.ShowTooltipInteraction.RegisterHandler(ctx =>
148148
{
149-
view.ShowTooltip(ctx.Input);
149+
view.ShowTooltip(ctx.Input, viewModel.Scale);
150150
ctx.SetOutput(System.Reactive.Unit.Default);
151151
})
152152
.DisposeWith(disposables);
@@ -305,7 +305,7 @@ HierarchyGridViewModel viewModel
305305
args.Handled = true;
306306
}
307307

308-
private void ShowTooltip(PositionedCell pCell)
308+
private void ShowTooltip(PositionedCell pCell, double scale)
309309
{
310310
_tooltip.Hide();
311311

@@ -323,13 +323,8 @@ private void ShowTooltip(PositionedCell pCell)
323323

324324
_tooltipRectangle.Width = pCell.Width - 6;
325325
_tooltipRectangle.Height = pCell.Height - 6;
326-
Canvas.SetLeft(_tooltipRectangle, pCell.Left + 3);
327-
Canvas.SetTop(_tooltipRectangle, pCell.Top + 3);
328-
329-
// var border = new Border() { HorizontalAlignment = HorizontalAlignment.Stretch };
330-
// border.Background = Brushes.Wheat;
331-
// border.Child = new TextBlock() { Text = text.Trim() };
332-
// _tooltip.Content = border;
326+
Canvas.SetLeft(_tooltipRectangle, (pCell.Left * scale) + 3);
327+
Canvas.SetTop(_tooltipRectangle, (pCell.Top * scale) + 3);
333328

334329
_tooltip.Content = text.Trim();
335330
_tooltip.Placement = PlacementMode.Bottom;

‎src/HierarchyGrid.Avalonia/HierarchyGrid.Avalonia.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Avalonia.Skia" Version="11.3.8" />
22+
<PackageReference Include="Avalonia.Skia" Version="11.3.10" />
2323
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
24-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.8" />
24+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.10" />
2525
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
2626
<PackageReference Include="ReactiveUI.Avalonia" Version="11.3.8" />
2727
<PackageReference Include="SkiaSharp.Views" Version="3.119.1" />
28-
<PackageReference Include="System.Text.Json" Version="10.0.0" />
28+
<PackageReference Include="System.Text.Json" Version="10.0.1" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

‎src/HierarchyGrid.Definitions.Tests/HierarchyGrid.Definitions.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ItemGroup>
99
<PackageReference Include="FluentAssertions" Version="8.8.0" />
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
11-
<PackageReference Include="System.Text.Json" Version="10.0.0" />
11+
<PackageReference Include="System.Text.Json" Version="10.0.1" />
1212
<PackageReference Include="xunit" Version="2.9.3" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1414
<PrivateAssets>all</PrivateAssets>

‎src/HierarchyGrid.Definitions/HierarchyGrid.Definitions.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
<ItemGroup>
3333
<PackageReference Include="LanguageExt.Core" Version="4.4.9" />
3434
<PackageReference Include="morelinq" Version="4.4.0" />
35-
<PackageReference Include="ReactiveUI" Version="22.2.1" />
35+
<PackageReference Include="ReactiveUI" Version="22.3.1" />
3636
<PackageReference Include="ReactiveUI.SourceGenerators" Version="2.5.1">
3737
<PrivateAssets>all</PrivateAssets>
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
</PackageReference>
40-
<PackageReference Include="System.Text.Json" Version="10.0.0" />
40+
<PackageReference Include="System.Text.Json" Version="10.0.1" />
4141
</ItemGroup>
4242
</Project>

‎src/HierarchyGrid.Skia/HierarchyGrid.Skia.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
2222
<PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="3.119.1" />
2323
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.1" />
24-
<PackageReference Include="Svg.Skia" Version="3.2.1" />
25-
<PackageReference Include="System.Text.Json" Version="10.0.0" />
24+
<PackageReference Include="Svg.Skia" Version="3.3.0" />
25+
<PackageReference Include="System.Text.Json" Version="10.0.1" />
2626
<PackageReference Include="Topten.RichTextKit" Version="0.4.167" />
2727
</ItemGroup>
2828

‎src/HierarchyGrid/HierarchyGrid.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
</PackageReference>
26-
<PackageReference Include="ReactiveUI.WPF" Version="22.2.1" />
26+
<PackageReference Include="ReactiveUI.WPF" Version="22.3.1" />
2727
<PackageReference Include="SkiaSharp.HarfBuzz" Version="3.119.1" />
2828
<PackageReference Include="SkiaSharp.Views.WPF" Version="3.119.1" />
2929
<PackageReference Include="TextCopy" Version="6.2.1" />

0 commit comments

Comments
 (0)