Skip to content

Commit b0e2548

Browse files
committed
Replace ShowDisabledTooltipExtension with ToolTip.ShowOnDisabled in XAML files
Reduced memory usage from excessive GetVisualDescendant calls previously
1 parent 446be68 commit b0e2548

5 files changed

Lines changed: 5 additions & 126 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
1818
- Fixed Triton/Sage install option showing for incompatible GPUs
1919
- Fixed errors from invalid pip specifiers in requirements files
2020
- Fixed package images sometimes showing as blank due to concurrent image caching. Requests to same image resources are now de-duplicated
21+
- Reduced memory usage from `ShowDisabledTooltipExtension`
2122
### Supporters
2223
#### Visionaries
2324
- Big shout-out to our Visionary-tier patrons: Waterclouds, Corey T, bluepopsicle, and Bob S! Your steadfast support keeps Stability Matrix moving forward, and we couldn’t do it without you. 🚀 Thank you!

StabilityMatrix.Avalonia/MarkupExtensions/ShowDisabledTooltipExtension.cs

Lines changed: 0 additions & 113 deletions
This file was deleted.

StabilityMatrix.Avalonia/Views/Dialogs/SelectModelVersionDialog.axaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
xmlns:fluentAvalonia="clr-namespace:FluentIcons.Avalonia.Fluent;assembly=FluentIcons.Avalonia.Fluent"
1212
xmlns:input="clr-namespace:FluentAvalonia.UI.Input;assembly=FluentAvalonia"
1313
xmlns:lang="clr-namespace:StabilityMatrix.Avalonia.Languages"
14-
xmlns:markupExtensions="clr-namespace:StabilityMatrix.Avalonia.MarkupExtensions"
1514
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1615
xmlns:models="clr-namespace:StabilityMatrix.Avalonia.Models"
1716
d:DataContext="{x:Static designData:DesignData.SelectModelVersionViewModel}"
@@ -303,12 +302,12 @@
303302

304303
<Button
305304
Margin="8,0"
306-
markupExtensions:ShowDisabledTooltipExtension.ShowOnDisabled="True"
307305
Classes="accent"
308306
Command="{Binding Import}"
309307
Content="{x:Static lang:Resources.Action_Import}"
310308
IsEnabled="{Binding IsImportEnabled}"
311309
IsVisible="{Binding !SelectedFile.IsInstalled, TargetNullValue=True, FallbackValue=True}"
310+
ToolTip.ShowOnDisabled="True"
312311
ToolTip.Tip="{Binding ImportTooltip}" />
313312

314313
<Button

StabilityMatrix.Avalonia/Views/PackageManager/MainPackageManagerView.axaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
xmlns:converters="clr-namespace:StabilityMatrix.Avalonia.Converters"
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:designData="clr-namespace:StabilityMatrix.Avalonia.DesignData"
9-
xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Runtime"
109
xmlns:icons="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
1110
xmlns:input="clr-namespace:FluentAvalonia.UI.Input;assembly=FluentAvalonia"
1211
xmlns:lang="clr-namespace:StabilityMatrix.Avalonia.Languages"
13-
xmlns:markupExtensions="clr-namespace:StabilityMatrix.Avalonia.MarkupExtensions"
1412
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1513
xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core"
1614
xmlns:packageManager="clr-namespace:StabilityMatrix.Avalonia.ViewModels.PackageManager"
@@ -335,10 +333,10 @@
335333
<Button
336334
Margin="4,4,4,0"
337335
Padding="4"
338-
markupExtensions:ShowDisabledTooltipExtension.ShowOnDisabled="True"
339336
Classes="borderless-success"
340337
Command="{Binding Update}"
341-
IsEnabled="{Binding !IsRunning}">
338+
IsEnabled="{Binding !IsRunning}"
339+
ToolTip.ShowOnDisabled="True">
342340
<ToolTip.Tip>
343341
<TextBlock>
344342
<Run Text="{x:Static lang:Resources.Label_UpdateAvailable}" />

StabilityMatrix.Avalonia/Views/PackageManager/PackageInstallDetailView.axaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,15 @@
33
xmlns="https://github.com/avaloniaui"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:avalonia="clr-namespace:FluentIcons.Avalonia;assembly=FluentIcons.Avalonia"
6-
xmlns:behaviors="clr-namespace:StabilityMatrix.Avalonia.Behaviors"
76
xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
8-
xmlns:controls1="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
97
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
108
xmlns:database="clr-namespace:StabilityMatrix.Core.Models.Database;assembly=StabilityMatrix.Core"
119
xmlns:designData="clr-namespace:StabilityMatrix.Avalonia.DesignData"
1210
xmlns:dialogs="clr-namespace:StabilityMatrix.Avalonia.Views.Dialogs"
13-
xmlns:labs="clr-namespace:Avalonia.Labs.Controls;assembly=Avalonia.Labs.Controls"
1411
xmlns:lang="clr-namespace:StabilityMatrix.Avalonia.Languages"
15-
xmlns:markupExtensions="clr-namespace:StabilityMatrix.Avalonia.MarkupExtensions"
1612
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1713
xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core"
1814
xmlns:packageManager="clr-namespace:StabilityMatrix.Avalonia.ViewModels.PackageManager"
19-
xmlns:python="clr-namespace:StabilityMatrix.Core.Python;assembly=StabilityMatrix.Core"
20-
xmlns:system="clr-namespace:System;assembly=System.Runtime"
2115
d:DataContext="{x:Static designData:DesignData.PackageInstallDetailViewModel}"
2216
d:DesignHeight="850"
2317
d:DesignWidth="800"
@@ -68,11 +62,11 @@
6862
IsChecked="{Binding !IsReleaseMode, Mode=TwoWay}" />
6963
<ToggleButton
7064
Grid.Column="1"
71-
markupExtensions:ShowDisabledTooltipExtension.ShowOnDisabled="True"
7265
Content="Releases"
7366
CornerRadius="0,8,8,0"
7467
IsChecked="{Binding IsReleaseMode, Mode=TwoWay}"
7568
IsEnabled="{Binding ShowReleaseMode}"
69+
ToolTip.ShowOnDisabled="True"
7670
ToolTip.Tip="{Binding ReleaseTooltipText}" />
7771

7872
<controls:BetterComboBox

0 commit comments

Comments
 (0)