개정판 1b2cf911
ArrowTextControl 수정
Change-Id: I6bce182ed18f0c65dc7587d0d84bccac557fdf0b
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 1062 | 1062 |
if (member.GetType().Name == "ArrowTextControl" && list[i] == (member as ArrowTextControl).MidPoint) |
| 1063 | 1063 |
{
|
| 1064 | 1064 |
Canvas.SetZIndex(tm, 95); |
| 1065 |
//tm.Opacity = 0; |
|
| 1065 | 1066 |
tm.DragDelta += MidPoint_DragDelta; |
| 1066 | 1067 |
} |
| 1067 | 1068 |
else |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2659 | 2659 |
|
| 2660 | 2660 |
ConvertInkControlToPolygon(); |
| 2661 | 2661 |
|
| 2662 |
///TODO:
|
|
| 2662 |
// 텍스트가 없으면 삭제됨
|
|
| 2663 | 2663 |
var text_item = ViewerDataModel.Instance.MarkupControls_USER.Where(data => |
| 2664 | 2664 |
(data as TextControl) != null && (data as TextControl).Text == "" || (data as ArrowTextControl) != null && (data as ArrowTextControl).ArrowText == "").FirstOrDefault(); |
| 2665 | 2665 |
|
| 2666 | 2666 |
if (text_item != null && (currentControl as ArrowTextControl) == null) |
| 2667 | 2667 |
{
|
| 2668 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(text_item); |
|
| 2668 |
DeleteCommand.Instance.Execute(new[] { text_item });
|
|
| 2669 |
//ViewerDataModel.Instance.MarkupControls_USER.Remove(text_item); |
|
| 2669 | 2670 |
} |
| 2670 | 2671 |
/// up to here |
| 2671 | 2672 |
|
| ... | ... | |
| 3887 | 3888 |
} |
| 3888 | 3889 |
|
| 3889 | 3890 |
CreateCommand.Instance.Execute(currentControl); |
| 3891 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3890 | 3892 |
|
| 3891 | 3893 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 3892 | 3894 |
(currentControl as ArrowTextControl).EnableEditing = false; |
| ... | ... | |
| 4405 | 4407 |
break; |
| 4406 | 4408 |
} |
| 4407 | 4409 |
|
| 4410 |
if (currentControl is ArrowTextControl) |
|
| 4411 |
{
|
|
| 4412 |
(currentControl as ArrowTextControl).EditEnded += (snd, evt) => |
|
| 4413 |
{
|
|
| 4414 |
var control = snd as ArrowTextControl; |
|
| 4415 |
|
|
| 4416 |
if (string.IsNullOrEmpty(control.ArrowText)) |
|
| 4417 |
{
|
|
| 4418 |
DeleteCommand.Instance.Execute(new [] { control });
|
|
| 4419 |
} |
|
| 4420 |
}; |
|
| 4421 |
|
|
| 4422 |
} |
|
| 4408 | 4423 |
//if (currentControl != null) |
| 4409 | 4424 |
//{
|
| 4410 | 4425 |
// currentControl.PageAngle = pageNavigator.CurrentPage.Angle; |
| MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
|---|---|---|
| 31 | 31 |
public TextBox Base_TextBox = null; |
| 32 | 32 |
public TextBlock Base_TextBlock = null; |
| 33 | 33 |
public Border BaseTextbox_Caret = null; |
| 34 |
public event EventHandler<EventArgs> EditEnded; |
|
| 35 |
|
|
| 34 | 36 |
|
| 35 | 37 |
private const double _CloudArcDepth = 0.8; /// 2018.05.14 added by humkyung |
| 36 | 38 |
|
| ... | ... | |
| 224 | 226 |
this.BaseTextbox_Caret.Visibility = Visibility.Collapsed; |
| 225 | 227 |
this.IsEditingMode = false; |
| 226 | 228 |
ApplyOverViewData(); |
| 229 |
|
|
| 230 |
if(EditEnded != null) |
|
| 231 |
{
|
|
| 232 |
EditEnded(this, new EventArgs()); |
|
| 233 |
} |
|
| 234 |
|
|
| 227 | 235 |
} |
| 228 | 236 |
|
| 229 | 237 |
void Base_TextBox_GotFocus(object sender, RoutedEventArgs e) |
| ... | ... | |
| 1526 | 1534 |
{
|
| 1527 | 1535 |
this.OverViewPathData = this.PathData; |
| 1528 | 1536 |
if (ArrowText == "") |
| 1537 |
{
|
|
| 1538 |
this.OverViewArrowText = ""; |
|
| 1529 | 1539 |
this.ArrowText = this.OverViewArrowText; |
| 1540 |
} |
|
| 1530 | 1541 |
else |
| 1531 | 1542 |
this.OverViewArrowText = this.ArrowText; |
| 1532 | 1543 |
this.OverViewStartPoint = this.StartPoint; |
내보내기 Unified diff
