fix: crash when merging paragraphs

Ttxman · Oct 14, 2014 · ae20f88 · ae20f88
1 parent c17ee11
commit ae20f88
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/WpfApplication2/Control/SubtitlesVizualizer.xaml.cs b/WpfApplication2/Control/SubtitlesVizualizer.xaml.cs
@@ -221,7 +221,8 @@ void l_MergeWithPreviousRequest(object sender, EventArgs e)
             Element el = (Element)sender;
             TranscriptionElement t = el.ValueElement;
             TranscriptionElement p = el.ValueElement.Previous();
-            t.Parent.BeginUpdate();
+            var parent = t.Parent;
+            parent.BeginUpdate();
             int len = p.Text.Length;
             if (t is TranscriptionParagraph && p is TranscriptionParagraph)
             {
@@ -237,13 +238,13 @@ void l_MergeWithPreviousRequest(object sender, EventArgs e)
                         pel.ValueElement = p;
                     }
                 }
-                t.Parent.Remove(t);
+                parent.Remove(t);
 
             }
-           // SpeakerChanged();
-            t.Parent.EndUpdate();
+            // SpeakerChanged();
+            parent.EndUpdate();
             ActiveTransctiption = p;
-            ScrollToItem(p);
+            // ScrollToItem(p);
             var vis = GetVisualForTransctiption(p);
             vis.editor.CaretOffset = len;
         }
@@ -272,8 +273,9 @@ void l_MergeWithnextRequest(object sender, EventArgs e)
             //SpeakerChanged();
             t.Parent.EndUpdate();
             ActiveTransctiption = t;
-            ScrollToItem(t);
+            //ScrollToItem(t);
             ColorizeBackground(t);
+            _scrollViewer.UpdateLayout();
             var vis = GetVisualForTransctiption(t);
             vis.editor.CaretOffset = len;
         }
@@ -469,7 +471,6 @@ private void ScrollToItem(TranscriptionElement elm)
 
             listbox.SelectedItem = elm;
             listbox.ScrollIntoView(listbox.Items[listbox.SelectedIndex]);
-            listbox.UpdateLayout();
             if (elm == Transcription.Last())
             {
                 _scrollViewer.ScrollToBottom();
@@ -478,12 +479,19 @@ private void ScrollToItem(TranscriptionElement elm)
             {
                 var all = listbox.VisualFindChildren<Element>();
                 var visible = all.Where(itm => listbox.VisualIsVisibleChild(itm));
-                if (!visible.Any(itm => itm.ValueElement == elm))
-                {
-                    var element = all.First(itm => itm.ValueElement == elm);
-                    var position = element.TransformToAncestor(_scrollViewer).Transform(new Point(0, element.ActualHeight));
-                    _scrollViewer.ScrollToVerticalOffset(position.Y);
-                }
+
+                Action scroll = new Action(() =>
+                    {
+                        all = listbox.VisualFindChildren<Element>();
+                        visible = all.Where(itm => listbox.VisualIsVisibleChild(itm));
+                        var element = all.First(itm => itm.ValueElement == elm);
+                        var position = element.TransformToAncestor(_scrollViewer).Transform(new Point(0, element.ActualHeight));
+                        _scrollViewer.ScrollToVerticalOffset(position.Y);
+                        _scrollViewer.UpdateLayout();
+                    });
+
+                if (visible.Any(itm => itm.ValueElement == elm))
+                    _scrollViewer.Dispatcher.BeginInvoke(DispatcherPriority.Loaded, scroll);
             }
         }