/MarkupToPDF/Controls/Text/ArrowTextControl.cs - Diff - MARKUS - 일정관리

개정판 8ebd5302

ID	8ebd53027168ac3a40302acfcb1b4f2a201b7632
상위	206eb77c
하위	0f1cd125

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

Fix: ArrowTextControl에서 중간점을 이동할때 발생하는 오류 수정

Change-Id: I62efbdb9c622ec878d8a27a543082738a9cd503d

+        {
             private const string PART_ArrowPath = "PART_ArrowPath";
             private const string PART_TextBox = "PART_ArrowTextBox";
             //private const string PART_TextBlock = "PART_ArrowTextBlock";
             private const string PART_ArrowSubPath = "PART_ArrowSubPath";
             private const string PART_Border = "PART_Border";
             private const string PART_BaseTextbox_Caret = "Caret";
-...
+                }
+            }
             public void MoveCustomCaret(Point point)
+            {
                 var caretLocation = this.Base_TextBox.GetRectFromCharacterIndex(this.Base_TextBox.CaretIndex).Location;
                 if (!double.IsInfinity(caretLocation.X))
+                {
                     if (Math.Abs(this.PageAngle) == 90)
+                    {
                         Canvas.SetLeft(this.BaseTextbox_Caret, point.X + caretLocation.Y);
+                    }
                     else if (Math.Abs(this.PageAngle) == 180)
+                    {
                         Canvas.SetLeft(this.BaseTextbox_Caret, (point.X + this.Base_TextBox.ActualWidth) - caretLocation.X);
+                    }
                     else if (Math.Abs(this.PageAngle) == 270)
+                    {
                         Canvas.SetLeft(this.BaseTextbox_Caret, (point.X) - caretLocation.Y);
+                    }
                     else
+                    {
                         Canvas.SetLeft(this.BaseTextbox_Caret, point.X + caretLocation.X);
+                    }
+                }
                 if (!double.IsInfinity(caretLocation.Y))
+                {
                     if (Math.Abs(this.PageAngle) == 90)
+                    {
                         Canvas.SetTop(this.BaseTextbox_Caret, point.Y - caretLocation.X);
+                    }
                     else if (Math.Abs(this.PageAngle) == 180)
+                    {
                         Canvas.SetTop(this.BaseTextbox_Caret, (point.Y + this.Base_TextBox.ActualHeight) - caretLocation.Y);
+                    }
                     else if (Math.Abs(this.CommentAngle) == 270)
+                    {
                         Canvas.SetTop(this.BaseTextbox_Caret, (point.Y) + caretLocation.X);
+                    }
                     else
+                    {
                         Canvas.SetTop(this.BaseTextbox_Caret, point.Y + caretLocation.Y);
+                    }
+                }
+            }
             void Base_TextBox_LostFocus(object sender, RoutedEventArgs e)
+            {
                 EditEnd();
-...
                             break;
+                    }
                     var ConnectionPoint = MathSet.getNearPoint(ps, this.StartPoint);
                     var ConnectionPoint = MathSet.getNearPoint(ps, this.MidPoint);
                     //20180911 LJY 꺾이는 부분 수정
                     Point BendingPoint = ConnectionPoint;
-...
+                    }
                     var ConnectionPoint = MathSet.getNearPoint(ps, this.StartPoint);
                     var ConnectionPoint = MathSet.getNearPoint(ps, this.MidPoint);
                     #region 보정치
                     Point BendingPoint = ConnectionPoint;
-...
                 IPath path = (this as IPath);
                 Point selected = MathSet.getNearPoint(path.PointSet, pt);
                 //StartPoint에 표시된 Thumb는 dx,dy가 +로 더해줘야한다.
                 if (path.PointSet.IndexOf(selected) != 0)
+                {
                     double radian = this.CommentAngle * Math.PI / 180;
                     double cos = Math.Cos(radian);
                     double sin = Math.Sin(radian);
                     double _dx = dx * cos - dy * sin;
                     double _dy = dx * sin + dy * cos;
                     selected.X += _dx;
                     selected.Y += _dy;
+                }
                 else
+                {
                     selected.X += dx;
                     selected.Y += dy;
+                }
                 selected.X += dx;
                 selected.Y += dy;
                 int i = 0;
                 for (i = 0; i < (this as IPath).PointSet.Count; i++)
-...
+                }
                 List<Point> pts = path.PointSet;
                 if ((pts[0].X > pts[1].X && dx > 0) || (pts[0].X < pts[1].X && dx < 0))
                 #region 끝점을 이동할때
                 if (i == 0)
+                {
                     pts[1] = new Point(pts[1].X + dx, pts[1].Y);
                     if ((pts[0].X > pts[1].X && dx > 0) || (pts[0].X < pts[1].X && dx < 0))
+                    {
                         pts[1] = new Point(pts[1].X + dx, pts[1].Y);
+                    }
                     if ((pts[0].Y > pts[1].Y && dy > 0) || (pts[0].Y < pts[1].Y && dy < 0))
+                    {
                         pts[1] = new Point(pts[1].X, pts[1].Y + dy);
+                    }
                     path.PointSet[1] = pts[1];
+                }
                 if ((pts[0].Y > pts[1].Y && dy > 0) || (pts[0].Y < pts[1].Y && dy < 0))
                 #endregion
                 #region 중간점을 이동할때
                 else if (i == 1)
+                {
                     pts[1] = new Point(pts[1].X, pts[1].Y + dy);
                     path.PointSet[1] = selected;
+                }
                 path.PointSet[1] = pts[1];
                 #endregion
                 if (path.PointSet.Count > i) {
                     path.PointSet[i] = selected;

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 8ebd5302