Skip to content

Commit 5629ce0

Browse files
committed
- Bug: Fix issue #160: crash when double clicking in Account view.
- Bug: Fix issue #159: account balance column in Transaction View.
1 parent 89f1707 commit 5629ce0

File tree

8 files changed

+28
-14
lines changed

8 files changed

+28
-14
lines changed

Source/WPF/MoneyPackage/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap">
3-
<Identity Name="43906ChrisLovett.MyMoney.Net" Publisher="CN=Chris Lovett, O=Chris Lovett, S=Washington, C=US" Version="2.1.0.57" />
3+
<Identity Name="43906ChrisLovett.MyMoney.Net" Publisher="CN=Chris Lovett, O=Chris Lovett, S=Washington, C=US" Version="2.1.0.58" />
44
<Properties>
55
<DisplayName>MyMoney.Net</DisplayName>
66
<PublisherDisplayName>Chris Lovett</PublisherDisplayName>

Source/WPF/MyMoney/Properties/PublishProfiles/ClickOnceProfile.pubxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
44
-->
55
<Project>
66
<PropertyGroup>
7-
<ApplicationRevision>57</ApplicationRevision>
8-
<ApplicationVersion>2.1.0.57</ApplicationVersion>
7+
<ApplicationRevision>58</ApplicationRevision>
8+
<ApplicationVersion>2.1.0.58</ApplicationVersion>
99
<BootstrapperEnabled>True</BootstrapperEnabled>
1010
<Configuration>Release</Configuration>
1111
<CreateWebPageOnPublish>True</CreateWebPageOnPublish>

Source/WPF/MyMoney/Setup/changes.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<changes>
3-
<change version="2.1.0.57" date="12/13/2025">
4-
- Bug: Fix account balance column in Transaction View.
3+
<change version="2.1.0.58" date="12/13/2025">
4+
- Bug: Fix issue #160: crash when double clicking in Account view.
5+
- Bug: Fix issue #159: account balance column in Transaction View.
56
</change>
67
<change version="2.1.0.56" date="12/10/2025">
7-
- Feature: Add account summary report with date picker.
8+
- Feature: issue #142: Add account summary report with date picker.
89
- Feature: Switch to https://www.fastforex.io/ for exchange rate info.
910
</change>
1011
<change version="2.1.0.54" date="12/8/2025">

Source/WPF/MyMoney/View Selectors/AccountsControl.xaml.cs

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Collections.Generic;
44
using System.Collections.ObjectModel;
55
using System.ComponentModel;
6+
using System.Diagnostics;
67
using System.Globalization;
78
using System.IO;
89
using System.Linq;
@@ -340,7 +341,15 @@ private void OnShowAllTransactions()
340341
private void OnListBoxMouseDoubleClick(object sender, MouseButtonEventArgs e)
341342
{
342343
this.delayedActions.CancelDelayedAction("SingleClick");
343-
object item = this.GetElementFromPoint(this.listBox1, e.GetPosition(this.listBox1));
344+
object item = null;
345+
try
346+
{
347+
this.GetElementFromPoint(this.listBox1, e.GetPosition(this.listBox1));
348+
}
349+
catch (Exception ex)
350+
{
351+
Debug.WriteLine("Ignoring hit test exception : " + ex.Message);
352+
}
344353

345354
if (item is AccountViewModel m)
346355
{
@@ -359,7 +368,7 @@ private void OnListBoxMouseDoubleClick(object sender, MouseButtonEventArgs e)
359368

360369
private object GetElementFromPoint(ItemsControl hostingControl, Point point)
361370
{
362-
UIElement element = (UIElement)hostingControl.InputHitTest(point);
371+
DependencyObject element = hostingControl.InputHitTest(point) as DependencyObject;
363372
while (element != null)
364373
{
365374

@@ -376,7 +385,11 @@ private object GetElementFromPoint(ItemsControl hostingControl, Point point)
376385
{
377386
return item;
378387
}
379-
element = (UIElement)VisualTreeHelper.GetParent(element);
388+
var parent = VisualTreeHelper.GetParent(element) as DependencyObject;
389+
if (parent == element) {
390+
break;
391+
}
392+
element = parent;
380393
}
381394

382395
return null;

Source/WPF/Version/Version.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
// And also sync this with the MSIX package manifest in
77
// ~\MyMoney.Net\Source\WPF\MoneyPackage\Package.appxmanifest
88

9-
[assembly: AssemblyVersion("2.1.0.57")]
10-
[assembly: AssemblyFileVersion("2.1.0.57")]
9+
[assembly: AssemblyVersion("2.1.0.58")]
10+
[assembly: AssemblyFileVersion("2.1.0.58")]

Source/WPF/Version/Version.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<ApplicationRevision>57</ApplicationRevision>
5-
<ApplicationVersion>2.1.0.57</ApplicationVersion>
4+
<ApplicationRevision>58</ApplicationRevision>
5+
<ApplicationVersion>2.1.0.58</ApplicationVersion>
66
</PropertyGroup>
77
</Project>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.0.57
1+
2.1.0.58

docs/Images/Transfers.png

32.1 KB
Loading

0 commit comments

Comments
 (0)