프로젝트

일반

사용자정보

개정판 490208bd

ID490208bde7b2ebf6b991d3c2ca75484c2ee8f48f
상위 a0d7575c
하위 50ffdad1

백흠경이(가) 4달 전에 추가함

Fix: 붙여넣기한 객체가 맨 위로 오도록 수정

Change-Id: I328c97aa0e2cc71af60f34b585c24429ac650b6a

차이점 보기:

KCOM/Events/PasteCommand.cs
68 68
                {
69 69
                    List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>();
70 70

  
71
                    //강인구 Undo/Redo 보류
72 71
                    MarkupToPDF.Common.UndoDataGroup UndoDataGrp = new UndoDataGroup()
73 72
                    {
74 73
                        IsUndo = false,
......
77 76

  
78 77
                    foreach (string parse in data)
79 78
                    {
80
                        if (parse != "")
79
                        if (!string.IsNullOrEmpty(parse))
81 80
                        {
82
                            string[] data2 = new string[2];
83
                            data2 = parse.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
81
                            string[] data2 = parse.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
84 82

  
85 83
                            System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, data2[0], ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, "#FFFF0000", string.Empty,
86 84
                                STAMP_Contents: App.SystemInfo.STAMP_CONTENTS);
87

  
88
                            var control = (item as MarkupToPDF.Common.CommentUserInfo);
85
                            if (!(item is MarkupToPDF.Common.CommentUserInfo control)) continue;
86
                            #region 리스트의 맨 끝에 추가
87
                            int index = ViewerDataModel.Instance.MarkupControls_USER.ToList().FindIndex(x => x == control);
88
                            ViewerDataModel.Instance.MarkupControls_USER.RemoveAt(index);
89
                            ViewerDataModel.Instance.MarkupControls_USER.Add(control);
90
                            #endregion
89 91

  
90 92
                            control.CommentID = Commons.ShortGuid();
91 93
                            control.MarkupInfoID = App.Custom_ViewInfoId;
92 94
                            control.IsNew = true;
95
                            control.ZIndex = CommentUserInfo.MaxZIndex;
93 96

  
94 97
                            if (data2.Length >= 2)
95 98
                            {

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)