개정판 6b5d33c6
issue #1002 comment 선택 시 control 객체의 focus event 로 인한 문제로 event 호출 위치및 순서를 정리.
Change-Id: Ie8752339ac93bab04e24f94dbc9a61d0db8f93bd
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 4762 | 4762 |
currentControl.SetValue(Canvas.ZIndexProperty, 2); |
| 4763 | 4763 |
currentControl.SetValue(TextControl.CanvasXProperty, canvasDrawingMouseDownPoint.X); |
| 4764 | 4764 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y); |
| 4765 |
currentControl.Focus(); |
|
| 4766 |
(currentControl as TextControl).ApplyOverViewData(); |
|
| 4765 |
|
|
| 4767 | 4766 |
(currentControl as TextControl).ControlType_No = 0; |
| 4768 | 4767 |
(currentControl as TextControl).Angle -= rotate.Angle; |
| 4769 | 4768 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 4769 |
(currentControl as TextControl).ApplyTemplate(); |
|
| 4770 |
(currentControl as TextControl).Base_TextBox.Focus(); |
|
| 4770 | 4771 |
|
| 4771 | 4772 |
CreateControl(); |
| 4772 | 4773 |
|
| 4773 |
//currentControl = null; |
|
| 4774 | 4774 |
} |
| 4775 | 4775 |
} |
| 4776 | 4776 |
} |
| ... | ... | |
| 4794 | 4794 |
currentControl.SetValue(Canvas.ZIndexProperty, 3); |
| 4795 | 4795 |
currentControl.SetValue(TextControl.CanvasXProperty, canvasDrawingMouseDownPoint.X); |
| 4796 | 4796 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y); |
| 4797 |
currentControl.Focus(); |
|
| 4797 |
|
|
| 4798 | 4798 |
(currentControl as TextControl).ControlType_No = 1; |
| 4799 | 4799 |
(currentControl as TextControl).Angle = Ang; |
| 4800 | 4800 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 4801 |
(currentControl as TextControl).ApplyTemplate(); |
|
| 4802 |
(currentControl as TextControl).Base_TextBox.Focus(); |
|
| 4801 | 4803 |
CreateControl(); |
| 4802 | 4804 |
|
| 4803 | 4805 |
//currentControl = null; |
| ... | ... | |
| 4824 | 4826 |
|
| 4825 | 4827 |
currentControl.SetValue(Canvas.ZIndexProperty, 3); |
| 4826 | 4828 |
currentControl.SetValue(TextControl.CanvasXProperty, canvasDrawingMouseDownPoint.X); |
| 4827 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y); |
|
| 4828 |
currentControl.Focus(); |
|
| 4829 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y); |
|
| 4829 | 4830 |
|
| 4830 | 4831 |
(currentControl as TextControl).Angle = Ang; |
| 4831 | 4832 |
(currentControl as TextControl).ControlType_No = 2; |
| 4832 | 4833 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 4833 |
|
|
| 4834 |
(currentControl as TextControl).ApplyTemplate(); |
|
| 4835 |
(currentControl as TextControl).Base_TextBox.Focus(); |
|
| 4834 | 4836 |
CreateControl(); |
| 4835 | 4837 |
//currentControl = null; |
| 4836 | 4838 |
} |
내보내기 Unified diff
