Skip to content

Commit

Permalink
Merge pull request #108 from LukeOrdelmans/bugfix/fix-property-change…
Browse files Browse the repository at this point in the history
…d-event-handler-deregistration-on-rendertransformoriginextension

Bugfix/fix property changed event handler deregistration on RenderTransformOriginExtension
  • Loading branch information
jogibear9988 committed Nov 29, 2023
2 parents 0dfcaeb + 8ab8159 commit 18b92a7
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

using System;
using System.ComponentModel;
using System.Threading;
using ICSharpCode.WpfDesign.Adorners;
using ICSharpCode.WpfDesign.Extensions;
using System.Windows.Controls.Primitives;
Expand All @@ -33,8 +34,7 @@ public class RenderTransformOriginExtension : SelectionAdornerProvider
{
readonly AdornerPanel adornerPanel;
RenderTransformOriginThumb renderTransformOriginThumb;
/// <summary>An array containing this.ExtendedItem as only element</summary>
readonly DesignItem[] extendedItemArray = new DesignItem[1];

// IPlacementBehavior resizeBehavior;
// PlacementOperation operation;
// ChangeGroup changeGroup;
Expand Down Expand Up @@ -86,7 +86,6 @@ void renderTransformOriginThumb_DragDelta(object sender, DragDeltaEventArgs e)
protected override void OnInitialized()
{
base.OnInitialized();
extendedItemArray[0] = this.ExtendedItem;
this.ExtendedItem.PropertyChanged += OnPropertyChanged;

if (this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformOriginProperty).IsSet) {
Expand Down Expand Up @@ -116,6 +115,7 @@ void OnPropertyChanged(object sender, System.ComponentModel.PropertyChangedEvent

protected override void OnRemove()
{
this.ExtendedItem.PropertyChanged -= OnPropertyChanged;
renderTransformOriginPropertyDescriptor.RemoveValueChanged(this.ExtendedItem.Component, OnRenderTransformOriginPropertyChanged);

base.OnRemove();
Expand Down

0 comments on commit 18b92a7

Please sign in to comment.