Skip to content

Commit

Permalink
Pulled latest changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ElektroKill committed May 28, 2021
1 parent dd6e2ae commit 4291259
Show file tree
Hide file tree
Showing 9 changed files with 420 additions and 153 deletions.
8 changes: 4 additions & 4 deletions EditTextBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ protected override void OnLostKeyboardFocus(KeyboardFocusChangedEventArgs e)
}
}

bool commiting;
bool committing;

void Commit()
{
if (!commiting) {
commiting = true;
if (!committing) {
committing = true;

if (Node != null) {
Node.IsEditing = false;
Expand All @@ -79,7 +79,7 @@ void Commit()
// Init();
//}

commiting = false;
committing = false;
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions LinesRenderer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Windows;
Expand All @@ -27,6 +28,13 @@ SharpTreeNodeView NodeView

protected override void OnRender(DrawingContext dc)
{
if (NodeView.Node == null) {
// This seems to happen sometimes with DataContext==DisconnectedItem,
// though I'm not sure why WPF would call OnRender() on a disconnected node
Debug.WriteLine($"LinesRenderer.OnRender() called with DataContext={NodeView.DataContext}");
return;
}

var indent = NodeView.CalculateIndent(NodeView.Node);
var p = new Point(indent + 4.5, 0);

Expand Down
Loading

0 comments on commit 4291259

Please sign in to comment.