개정판 ef7ba61f
Fix: 선택한 객체가 화면 최상단에 올라오는 오류 수정
Change-Id: I3eb1adeb497bf6d2e7a09dbed185e57478bda0a2
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
1086 | 1086 |
{ |
1087 | 1087 |
var control = await MarkupParser.ParseExAsync(App.BaseAddress, cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, PageAngle, sColor, "", |
1088 | 1088 |
markup.MarkupInfoID, markup.ID); |
1089 |
Canvas.SetZIndex(control, (control as CommentUserInfo).ZIndex); |
|
1090 |
control.Visibility = Visibility.Hidden; |
|
1089 |
if (control != null) |
|
1090 |
{ |
|
1091 |
Canvas.SetZIndex(control, (control as CommentUserInfo).ZIndex); |
|
1092 |
control.Visibility = Visibility.Hidden; |
|
1093 |
} |
|
1091 | 1094 |
} |
1092 | 1095 |
else |
1093 | 1096 |
{ |
1094 | 1097 |
var control = await MarkupParser.ParseExAsync(App.BaseAddress, cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, PageAngle, sColor, "", |
1095 | 1098 |
markup.MarkupInfoID, markup.ID); |
1096 |
Canvas.SetZIndex(control, (control as CommentUserInfo).ZIndex); |
|
1097 |
control.Visibility = Visibility.Hidden; |
|
1099 |
if (control != null) |
|
1100 |
{ |
|
1101 |
Canvas.SetZIndex(control, (control as CommentUserInfo).ZIndex); |
|
1102 |
control.Visibility = Visibility.Hidden; |
|
1103 |
} |
|
1098 | 1104 |
} |
1099 | 1105 |
} |
1100 | 1106 |
} |
... | ... | |
4732 | 4738 |
//{ |
4733 | 4739 |
btnFinalPDF.IsEnabled = false; |
4734 | 4740 |
btnConsolidate.IsEnabled = false; |
4735 |
var result = await ConsolidationMethod();
|
|
4741 |
var result = await ConsolidationMethod(); |
|
4736 | 4742 |
|
4737 | 4743 |
if(result) |
4738 | 4744 |
{ |
내보내기 Unified diff