개정판 6b5d33c6
issue #1002 comment 선택 시 control 객체의 focus event 로 인한 문제로 event 호출 위치및 순서를 정리.
Change-Id: Ie8752339ac93bab04e24f94dbc9a61d0db8f93bd
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 3185 | 3185 |
|
| 3186 | 3186 |
instance.Base_TextBox.Visibility = Visibility.Collapsed; |
| 3187 | 3187 |
instance.Base_TextBlock.Visibility = Visibility.Visible; |
| 3188 |
instance.DrawingCloud(); |
|
| 3189 |
instance.SetText(); |
|
| 3188 |
//instance.DrawingCloud();
|
|
| 3189 |
//instance.SetText();
|
|
| 3190 | 3190 |
} |
| 3191 | 3191 |
} |
| 3192 | 3192 |
break; |
| ... | ... | |
| 3924 | 3924 |
instance.Base_TextBlock.Margin = new Thickness(0, 0, 10, 0); |
| 3925 | 3925 |
instance.Base_TextBox.Visibility = Visibility.Collapsed; |
| 3926 | 3926 |
instance.Base_TextBlock.Visibility = Visibility.Visible; |
| 3927 |
instance.DrawingCloud(); |
|
| 3928 |
instance.SetText(); |
|
| 3927 |
//instance.DrawingCloud();
|
|
| 3928 |
//instance.SetText();
|
|
| 3929 | 3929 |
} |
| 3930 | 3930 |
} |
| 3931 | 3931 |
break; |
| ... | ... | |
| 4770 | 4770 |
if (instance.Text != null) |
| 4771 | 4771 |
{
|
| 4772 | 4772 |
//Layer.Children.Add(instance); |
| 4773 |
instance.CommentID = commentId; |
|
| 4774 | 4773 |
instance.MarkupInfoID = markupInfoID; |
| 4775 |
baseLayer.Add(instance); |
|
| 4776 |
System.Diagnostics.Debug.WriteLine(instance.Angle); |
|
| 4777 |
instance.ApplyTemplate(); |
|
| 4774 |
instance.CommentID = commentId; |
|
| 4778 | 4775 |
instance.Memo = s.Memo; |
| 4776 |
baseLayer.Add(instance); |
|
| 4777 |
instance.ApplyTemplate(); |
|
| 4778 |
|
|
| 4779 | 4779 |
if (s.fontConfig.Count() == 4) |
| 4780 | 4780 |
{
|
| 4781 | 4781 |
instance.UnderLine = TextDecorations.Underline; |
| ... | ... | |
| 4788 | 4788 |
instance.Base_TextBox.Visibility = Visibility.Collapsed; |
| 4789 | 4789 |
instance.Base_TextBlock.Visibility = Visibility.Visible; |
| 4790 | 4790 |
|
| 4791 |
//instance.DrawingCloud(); |
|
| 4791 | 4792 |
|
| 4792 |
instance.DrawingCloud(); |
|
| 4793 |
instance.SetText(); |
|
| 4794 | 4793 |
} |
| 4795 | 4794 |
} |
| 4796 | 4795 |
break; |
| ... | ... | |
| 6404 | 6403 |
instance.Base_TextBlock.Visibility = Visibility.Visible; |
| 6405 | 6404 |
|
| 6406 | 6405 |
instance.CommentID = commentId; |
| 6407 |
instance.DrawingCloud(); |
|
| 6408 |
instance.SetText(); |
|
| 6406 |
//instance.DrawingCloud();
|
|
| 6407 |
//instance.SetText();
|
|
| 6409 | 6408 |
return_control = instance; |
| 6410 | 6409 |
} |
| 6411 | 6410 |
} |
내보내기 Unified diff
