개정판 8742caa5
Text 생성시 ESC키가 적용되지 않는 오류 수정
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2576 | 2576 |
} |
| 2577 | 2577 |
} |
| 2578 | 2578 |
|
| 2579 |
if(currentControl == null) |
|
| 2579 |
mouseButtonDown = e.ChangedButton; |
|
| 2580 |
/// complete drawing text control when user click mouse right button - 2018.05.14 added by humkyung |
|
| 2581 |
if ((mouseButtonDown == MouseButton.Right) && (currentControl != null)) |
|
| 2580 | 2582 |
{
|
| 2581 | 2583 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as TextControl) != null && (data as TextControl).Base_TextBox.Visibility == Visibility.Visible).FirstOrDefault(); |
| 2582 | 2584 |
if (text_item_ != null) |
| ... | ... | |
| 2606 | 2608 |
{
|
| 2607 | 2609 |
(e.OriginalSource as System.Windows.Controls.Image).Focus(); |
| 2608 | 2610 |
} |
| 2609 |
|
|
| 2610 |
mouseButtonDown = e.ChangedButton; |
|
| 2611 |
|
|
| 2611 | 2612 |
if (mouseButtonDown == MouseButton.Left) |
| 2612 | 2613 |
{
|
| 2613 | 2614 |
canvasDrawingMouseDownPoint = e.GetPosition(drawingRotateCanvas); |
| ... | ... | |
| 3547 | 3548 |
{
|
| 3548 | 3549 |
if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 3549 | 3550 |
{
|
| 3550 |
|
|
| 3551 | 3551 |
currentControl = new TextControl |
| 3552 | 3552 |
{
|
| 3553 | 3553 |
ControlType = controlType |
| 3554 | 3554 |
}; |
| 3555 |
currentControl.CommentID = Save.shortGuid();
|
|
| 3556 |
currentControl.IsNew = true;
|
|
| 3557 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId;
|
|
| 3558 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl);
|
|
| 3559 |
currentControl.SetValue(Canvas.ZIndexProperty, 2);
|
|
| 3560 |
currentControl.SetValue(TextControl.CanvasXProperty, canvasDrawingMouseDownPoint.X);
|
|
| 3561 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y);
|
|
| 3562 |
currentControl.Focus();
|
|
| 3563 |
(currentControl as TextControl).ApplyOverViewData();
|
|
| 3564 |
(currentControl as TextControl).ControlType_No = 0;
|
|
| 3565 |
(currentControl as TextControl).Angle -= rotate.Angle;
|
|
| 3566 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape;
|
|
| 3555 |
currentControl.CommentID = Save.shortGuid(); |
|
| 3556 |
currentControl.IsNew = true; |
|
| 3557 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
|
| 3558 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3559 |
currentControl.SetValue(Canvas.ZIndexProperty, 2); |
|
| 3560 |
currentControl.SetValue(TextControl.CanvasXProperty, canvasDrawingMouseDownPoint.X); |
|
| 3561 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y); |
|
| 3562 |
currentControl.Focus(); |
|
| 3563 |
(currentControl as TextControl).ApplyOverViewData(); |
|
| 3564 |
(currentControl as TextControl).ControlType_No = 0; |
|
| 3565 |
(currentControl as TextControl).Angle -= rotate.Angle; |
|
| 3566 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
|
| 3567 | 3567 |
|
| 3568 |
CreateControl();
|
|
| 3568 |
CreateControl(); |
|
| 3569 | 3569 |
|
| 3570 |
currentControl = null;
|
|
| 3570 |
//currentControl = null;
|
|
| 3571 | 3571 |
} |
| 3572 | 3572 |
} |
| 3573 | 3573 |
} |
| ... | ... | |
| 3597 | 3597 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3598 | 3598 |
CreateControl(); |
| 3599 | 3599 |
|
| 3600 |
currentControl = null; |
|
| 3600 |
//currentControl = null;
|
|
| 3601 | 3601 |
} |
| 3602 | 3602 |
} |
| 3603 | 3603 |
} |
| ... | ... | |
| 3627 | 3627 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3628 | 3628 |
|
| 3629 | 3629 |
CreateControl(); |
| 3630 |
currentControl = null; |
|
| 3630 |
//currentControl = null;
|
|
| 3631 | 3631 |
} |
| 3632 | 3632 |
} |
| 3633 | 3633 |
} |
| ... | ... | |
| 3645 | 3645 |
(currentControl as ArrowTextControl).EnableEditing = false; |
| 3646 | 3646 |
currentControl = null; |
| 3647 | 3647 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3648 |
|
|
| 3649 | 3648 |
} |
| 3650 | 3649 |
else |
| 3651 | 3650 |
{
|
내보내기 Unified diff
