개정판 71d7e0bf
issue #000 TextControl Gotfocus 받을 때 TextBox가 EditMode가 안되는 현상 해결.
ArrowTextControl과 TextControl에 있는 IsEditing 속성 및 의존속성을 제거 이유는 EnableEditing과 동일한 역할을 하고 있기 때문에 필요없다.
Change-Id: Ic4452154655c07eaf5730a0dcebdb255237851ee
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2953 | 2953 |
{
|
| 2954 | 2954 |
(text_item_ as TextControl).Base_TextBlock.Visibility = Visibility.Visible; |
| 2955 | 2955 |
(text_item_ as TextControl).Base_TextBox.Visibility = Visibility.Collapsed; |
| 2956 |
(text_item_ as TextControl).IsEditing = false; |
|
| 2957 | 2956 |
(text_item_ as TextControl).EnableEditing = false; |
| 2958 | 2957 |
currentControl = null; |
| 2959 | 2958 |
} |
| ... | ... | |
| 3110 | 3109 |
|
| 3111 | 3110 |
if ((control as TextControl) != null) |
| 3112 | 3111 |
{
|
| 3112 |
if(!((control as TextControl).EnableEditing)) {
|
|
| 3113 |
(control as TextControl).EnableEditing = true; |
|
| 3114 |
} |
|
| 3115 |
|
|
| 3113 | 3116 |
if ((control as TextControl).TextStyle == FontStyles.Italic) |
| 3114 | 3117 |
{
|
| 3115 | 3118 |
ViewerDataModel.Instance.checkTextStyle = true; |
| ... | ... | |
| 3149 | 3152 |
} |
| 3150 | 3153 |
else if ((control as ArrowTextControl) != null) |
| 3151 | 3154 |
{
|
| 3155 |
if (!((control as ArrowTextControl).EnableEditing)){
|
|
| 3156 |
(control as ArrowTextControl).EnableEditing = true; |
|
| 3157 |
} |
|
| 3152 | 3158 |
if ((control as ArrowTextControl).TextStyle == FontStyles.Italic) |
| 3153 | 3159 |
{
|
| 3154 | 3160 |
ViewerDataModel.Instance.checkTextStyle = true; |
| ... | ... | |
| 4218 | 4224 |
CreateCommand.Instance.Execute(currentControl); |
| 4219 | 4225 |
|
| 4220 | 4226 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 4221 |
(currentControl as ArrowTextControl).IsEditing = false; |
|
| 4222 | 4227 |
(currentControl as ArrowTextControl).EnableEditing = false; |
| 4223 | 4228 |
(currentControl as ArrowTextControl).IsNew = false; |
| 4224 | 4229 |
currentControl = null; |
내보내기 Unified diff
