개정판 49b217ad
Revised - Text 생성 시 ESC키가 적용되지 않는 오류 수정
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2606 | 2606 |
mouseButtonDown = e.ChangedButton; |
| 2607 | 2607 |
/// complete drawing text control when user click mouse right button - 2018.05.14 added by humkyung |
| 2608 | 2608 |
|
| 2609 |
if (currentControl == null) |
|
| 2610 |
//if ((mouseButtonDown == MouseButton.Right) && (currentControl != null)) |
|
| 2609 |
//if (currentControl != null) |
|
| 2611 | 2610 |
{
|
| 2612 | 2611 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as TextControl) != null && (data as TextControl).Base_TextBox.Visibility == Visibility.Visible).FirstOrDefault(); |
| 2613 | 2612 |
if (text_item_ != null) |
| ... | ... | |
| 2616 | 2615 |
(text_item_ as TextControl).Base_TextBox.Visibility = Visibility.Collapsed; |
| 2617 | 2616 |
(text_item_ as TextControl).IsEditing = false; |
| 2618 | 2617 |
(text_item_ as TextControl).EnableEditing = false; |
| 2619 |
//currentControl = null;
|
|
| 2618 |
currentControl = null; |
|
| 2620 | 2619 |
} |
| 2621 | 2620 |
|
| 2622 | 2621 |
var Arrowtext_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as ArrowTextControl) != null && (data as ArrowTextControl).IsEditingMode == true).FirstOrDefault(); |
| 2623 |
if (Arrowtext_item_ != null) |
|
| 2622 |
if (Arrowtext_item_ != null && ((Arrowtext_item_ as ArrowTextControl).IsNew == false))
|
|
| 2624 | 2623 |
{
|
| 2625 | 2624 |
(Arrowtext_item_ as ArrowTextControl).IsEditingMode = false; |
| 2626 | 2625 |
(Arrowtext_item_ as ArrowTextControl).Base_TextBox.Focusable = false; |
| 2627 |
//currentControl = null;
|
|
| 2626 |
currentControl = null; |
|
| 2628 | 2627 |
} |
| 2629 | 2628 |
} |
| 2630 | 2629 |
|
| ... | ... | |
| 2686 | 2685 |
//if (mouseButtonDown == MouseButton.Left && ViewerDataModel.Instance.MarkupControls_USER.Count > 0 && mouseHandlingMode != MouseHandlingMode.Drawing && currentControl == null) |
| 2687 | 2686 |
if (mouseButtonDown == MouseButton.Left && mouseHandlingMode != MouseHandlingMode.Drawing && currentControl == null) |
| 2688 | 2687 |
{
|
| 2689 |
|
|
| 2690 | 2688 |
if (mouseHandlingMode == MouseHandlingMode.Selecting) |
| 2691 | 2689 |
{
|
| 2692 | 2690 |
if (SelectLayer.Children.Count == 0) |
| ... | ... | |
| 3598 | 3596 |
|
| 3599 | 3597 |
CreateControl(); |
| 3600 | 3598 |
|
| 3601 |
currentControl = null; |
|
| 3599 |
//currentControl = null;
|
|
| 3602 | 3600 |
} |
| 3603 | 3601 |
} |
| 3604 | 3602 |
} |
| ... | ... | |
| 3628 | 3626 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3629 | 3627 |
CreateControl(); |
| 3630 | 3628 |
|
| 3631 |
currentControl = null; |
|
| 3629 |
//currentControl = null;
|
|
| 3632 | 3630 |
} |
| 3633 | 3631 |
} |
| 3634 | 3632 |
} |
| ... | ... | |
| 3658 | 3656 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3659 | 3657 |
|
| 3660 | 3658 |
CreateControl(); |
| 3661 |
currentControl = null; |
|
| 3659 |
//currentControl = null;
|
|
| 3662 | 3660 |
} |
| 3663 | 3661 |
} |
| 3664 | 3662 |
} |
| ... | ... | |
| 3674 | 3672 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 3675 | 3673 |
(currentControl as ArrowTextControl).IsEditing = false; |
| 3676 | 3674 |
(currentControl as ArrowTextControl).EnableEditing = false; |
| 3675 |
(currentControl as ArrowTextControl).IsNew = false; |
|
| 3677 | 3676 |
currentControl = null; |
| 3678 | 3677 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3679 | 3678 |
} |
| ... | ... | |
| 3712 | 3711 |
{
|
| 3713 | 3712 |
CreateControl(); |
| 3714 | 3713 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 3714 |
currentControl.IsNew = false; |
|
| 3715 | 3715 |
currentControl = null; |
| 3716 | 3716 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3717 | 3717 |
} |
| ... | ... | |
| 3751 | 3751 |
{
|
| 3752 | 3752 |
CreateControl(); |
| 3753 | 3753 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 3754 |
currentControl.IsNew = false; |
|
| 3754 | 3755 |
currentControl = null; |
| 3755 | 3756 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3756 | 3757 |
} |
| ... | ... | |
| 3791 | 3792 |
{
|
| 3792 | 3793 |
CreateControl(); |
| 3793 | 3794 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 3795 |
currentControl.IsNew = false; |
|
| 3794 | 3796 |
currentControl = null; |
| 3795 | 3797 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3796 | 3798 |
} |
| ... | ... | |
| 3833 | 3835 |
{
|
| 3834 | 3836 |
CreateControl(); |
| 3835 | 3837 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 3838 |
currentControl.IsNew = false; |
|
| 3836 | 3839 |
currentControl = null; |
| 3837 | 3840 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3838 | 3841 |
} |
| ... | ... | |
| 3872 | 3875 |
{
|
| 3873 | 3876 |
CreateControl(); |
| 3874 | 3877 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 3878 |
currentControl.IsNew = false; |
|
| 3875 | 3879 |
currentControl = null; |
| 3876 | 3880 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3877 | 3881 |
} |
내보내기 Unified diff
