개정판 b2d0f316
Feature: 선택한 객체를 앞으로(+)/뒤로(-) 보내기 기능 추가
Change-Id: I9130a93cfdb2d079f28258f3d669a6f532695f89
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 258 | 258 |
InitializeComponent(); |
| 259 | 259 |
objectData.IsHitTestVisible = false; |
| 260 | 260 |
|
| 261 |
if ((objectData as ArrowTextControl) != null)
|
|
| 261 |
if (objectData is ArrowTextControl ArrTextCtrl)
|
|
| 262 | 262 |
{
|
| 263 |
(objectData as ArrowTextControl).Base_TextBox.Focusable = true;
|
|
| 263 |
ArrTextCtrl.Base_TextBox.Focusable = true;
|
|
| 264 | 264 |
} |
| 265 | 265 |
|
| 266 |
Canvas.SetZIndex(objectData, 84); |
|
| 266 |
///Canvas.SetZIndex(objectData, 84);
|
|
| 267 | 267 |
try |
| 268 | 268 |
{
|
| 269 | 269 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(objectData); |
| ... | ... | |
| 274 | 274 |
|
| 275 | 275 |
} |
| 276 | 276 |
|
| 277 |
SetAdornerMember(objectData as CommentUserInfo);
|
|
| 277 |
SetAdornerMember(objectData); |
|
| 278 | 278 |
this.Focus(); |
| 279 | 279 |
} |
| 280 | 280 |
|
| ... | ... | |
| 284 | 284 |
foreach (var item in objectData) |
| 285 | 285 |
{
|
| 286 | 286 |
//item.IsHitTestVisible = false; |
| 287 |
if ((item as ArrowTextControl) != null)
|
|
| 287 |
if (item is ArrowTextControl ArrTextCtrl)
|
|
| 288 | 288 |
{
|
| 289 |
(item as ArrowTextControl).Base_TextBox.Focusable = true;
|
|
| 289 |
ArrTextCtrl.Base_TextBox.Focusable = true;
|
|
| 290 | 290 |
} |
| 291 | 291 |
try |
| 292 | 292 |
{
|
| 293 |
Canvas.SetZIndex(item, 80); |
|
| 293 |
///Canvas.SetZIndex(item, 80); |
|
| 294 |
|
|
| 294 | 295 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item); |
| 295 | 296 |
this.ContainerContent.Children.Add(item); |
| 296 | 297 |
} |
| ... | ... | |
| 342 | 343 |
{
|
| 343 | 344 |
return BorderSize; |
| 344 | 345 |
} |
| 345 |
public void addMemberControl(UIElement objectData) |
|
| 346 |
{
|
|
| 347 |
this.ContainerContent.Children.Add(objectData); |
|
| 348 |
SetAdornerMember(objectData as CommentUserInfo); |
|
| 349 |
this.Focus(); |
|
| 350 |
} |
|
| 351 | 346 |
|
| 352 | 347 |
private void TextControlLostFocus(object sender,RoutedEventArgs e) |
| 353 | 348 |
{
|
| 354 | 349 |
TextCompensation = false; |
| 355 | 350 |
BorderUpdate(); |
| 356 | 351 |
|
| 357 |
if (sender is TextBox) |
|
| 352 |
if (sender is TextBox TextBox)
|
|
| 358 | 353 |
{
|
| 359 |
if ((sender as TextBox).Text == "") //보류
|
|
| 354 |
if (TextBox.Text == "") //보류
|
|
| 360 | 355 |
{
|
| 361 | 356 |
this.ContainerContent.Children.Remove((sender as TextBox).Parent as MarkupToPDF.Common.CommentUserInfo); |
| 362 | 357 |
this.Visibility = Visibility.Collapsed; |
| ... | ... | |
| 821 | 816 |
/// <summary> |
| 822 | 817 |
/// UIElement 해제 |
| 823 | 818 |
/// </summary> |
| 824 |
public void unRegister()
|
|
| 819 |
public void UnRegister()
|
|
| 825 | 820 |
{
|
| 826 | 821 |
foreach (var item in this.ContainerContent.Children) |
| 827 | 822 |
{
|
| ... | ... | |
| 1668 | 1663 |
|
| 1669 | 1664 |
private void DragThumb_MouseDoubleClick(object sender, MouseButtonEventArgs e) |
| 1670 | 1665 |
{
|
| 1671 |
if ((this.Members[0] as AdornerMember).DrawingData.GetType().Name == "TextControl"
|
|
| 1672 |
|| (this.Members[0] as AdornerMember).DrawingData.GetType().Name == "ArrowTextControl")
|
|
| 1666 |
if (this.Members[0].DrawingData.GetType().Name == "TextControl"
|
|
| 1667 |
|| this.Members[0].DrawingData.GetType().Name == "ArrowTextControl")
|
|
| 1673 | 1668 |
{
|
| 1674 | 1669 |
DragThumb.Visibility = Visibility.Collapsed; |
| 1675 | 1670 |
} |
내보내기 Unified diff
