개정판 fd19a116
Fix: Conslidate할때 Z정렬이 유지되지 않는 오류 수정
Change-Id: I54e1878e0365f94ede14e366e6e769fe9fd4b4ec
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 164 | 164 |
{
|
| 165 | 165 |
if (ViewerDataModel.Instance.IsPressCtrl && (App.ViewInfo.CreateFinalPDFPermission || App.ViewInfo.NewCommentPermission)) |
| 166 | 166 |
{
|
| 167 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as TextControl) != null && (data as TextControl).IsEditingMode == true).FirstOrDefault();
|
|
| 167 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => data is TextControl && (data as TextControl).IsEditingMode);
|
|
| 168 | 168 |
if (text_item_ != null) |
| 169 | 169 |
{
|
| 170 | 170 |
(text_item_ as TextControl).Base_TextBlock.Visibility = Visibility.Visible; |
| ... | ... | |
| 174 | 174 |
SelectionSet.Instance.UnSelect(ViewerDataModel.Instance.SystemMain.dzMainMenu); |
| 175 | 175 |
} |
| 176 | 176 |
|
| 177 |
var Arrowtext_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as ArrowTextControl) != null && (data as ArrowTextControl).IsEditingMode == true).FirstOrDefault();
|
|
| 177 |
var Arrowtext_item_ = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => data is ArrowTextControl && (data as ArrowTextControl).IsEditingMode);
|
|
| 178 | 178 |
if (Arrowtext_item_ != null && ((Arrowtext_item_ as ArrowTextControl).IsNew == false)) |
| 179 | 179 |
{
|
| 180 | 180 |
(Arrowtext_item_ as ArrowTextControl).IsEditingMode = false; |
| ... | ... | |
| 191 | 191 |
|
| 192 | 192 |
this.dzMainMenu.currentControl = null; |
| 193 | 193 |
|
| 194 |
//this.dzTopMenu.SaveEvent(null, null); |
|
| 195 | 194 |
if (App.ViewInfo.CreateFinalPDFPermission || App.ViewInfo.NewCommentPermission) |
| 196 | 195 |
{
|
| 197 | 196 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
| 198 | 197 |
this.dzTopMenu.SaveEventCallback(new object(), null); |
| 199 | 198 |
} |
| 200 |
|
|
| 201 |
//저장완료후 임시파일 삭제 |
|
| 202 |
//TempFile.Remove(); |
|
| 203 | 199 |
} |
| 204 | 200 |
} |
| 205 | 201 |
break; |
| ... | ... | |
| 478 | 474 |
case Key.Add: |
| 479 | 475 |
foreach (var item in SelectionSet.Instance.SelectedItems) |
| 480 | 476 |
{
|
| 481 |
if (item.ZIndex < 99)
|
|
| 477 |
if (item.ZIndex < CommentUserInfo.MaxZIndex)
|
|
| 482 | 478 |
{
|
| 483 | 479 |
item.ZIndex++; |
| 484 | 480 |
Canvas.SetZIndex(item, item.ZIndex); |
내보내기 Unified diff
