개정판 819630e9
issue #000 TextControl 새로 생성 시 EnableEditing 값이 변경 될때 EditingMode 설정하는 로직 주석처리.
SelectLayer에 ZIndex Maxium 값인 32766로 주었다. 선택된 컨트롤이 AdornerFinal에 들어가고 AdornerFinal로 생성된 객체가 SelectLayer에 들어므로
SelectLayer는 drawingRotateCanvas에서 최상단으로 먼저나와야 한다.
Change-Id: I8f3a8cd305d369e349c229327035f48a7cb25e5d
| KCOM/Views/MainMenu.xaml | ||
|---|---|---|
| 167 | 167 |
Width="{Binding ImageViewWidth, Source={x:Static common:ViewerDataModel.Instance}}"
|
| 168 | 168 |
Height="{Binding ImageViewHeight, Source={x:Static common:ViewerDataModel.Instance}}" >
|
| 169 | 169 |
</Image> |
| 170 |
|
|
| 171 |
<Canvas x:Name="SelectLayer" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/> |
|
| 170 |
|
|
| 171 |
<Canvas x:Name="SelectLayer" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Panel.ZIndex="32766"/>
|
|
| 172 | 172 |
<Border x:Name="dragSelectionBorder" Visibility="Collapsed" |
| 173 | 173 |
BorderBrush="Blue" |
| 174 | 174 |
BorderThickness="1" |
| MarkupToPDF/Controls/Text/TextControl.cs | ||
|---|---|---|
| 87 | 87 |
this.Base_TextBox.SizeChanged += new SizeChangedEventHandler(Base_TextBox_SizeChanged); |
| 88 | 88 |
this.Base_TextBlock.SizeChanged += new SizeChangedEventHandler(Base_TextBlock_SizeChanged); |
| 89 | 89 |
this.Base_TextBox.GotFocus += new RoutedEventHandler(TextControl_GotFocus); |
| 90 |
this.Base_TextBox.LostFocus += new RoutedEventHandler(TextControl_LostFocus);
|
|
| 91 |
|
|
| 90 |
this.Base_TextBox.LostFocus += new RoutedEventHandler(TextControl_LostFocus); |
|
| 91 |
|
|
| 92 | 92 |
DrawingCloud(); |
| 93 | 93 |
SetText(); |
| 94 | 94 |
} |
| 95 |
|
|
| 96 | 95 |
|
| 97 | 96 |
public override void ApplyOverViewData() |
| 98 | 97 |
{
|
| ... | ... | |
| 1076 | 1075 |
{
|
| 1077 | 1076 |
instance.SetValue(e.Property, e.NewValue); |
| 1078 | 1077 |
|
| 1079 |
if (instance.EnableEditing) |
|
| 1080 |
{
|
|
| 1081 |
instance.EditingMode(); |
|
| 1082 |
} |
|
| 1083 |
else |
|
| 1084 |
{
|
|
| 1085 |
instance.UnEditingMode(); |
|
| 1086 |
} |
|
| 1078 |
//if (instance.EnableEditing)
|
|
| 1079 |
//{
|
|
| 1080 |
// instance.EditingMode();
|
|
| 1081 |
//}
|
|
| 1082 |
//else
|
|
| 1083 |
//{
|
|
| 1084 |
// instance.UnEditingMode();
|
|
| 1085 |
//}
|
|
| 1087 | 1086 |
} |
| 1088 | 1087 |
} |
| 1089 | 1088 |
|
내보내기 Unified diff
