개정판 190248a5
issue #913 rotating 문서의 Text Control 이동 시 컨트롤 제어 불가 현상
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 143 | 143 |
/// </summary> |
| 144 | 144 |
/// <param name="member">UIElement 타입으로 BaseLayer에 있는 것들이 들어옵니다.</param> |
| 145 | 145 |
public void SetAdornerMember(MarkupToPDF.Common.CommentUserInfo member) |
| 146 |
{
|
|
| 147 |
|
|
| 146 |
{
|
|
| 147 |
|
|
| 148 | 148 |
switch (member.GetType().Name) |
| 149 | 149 |
{
|
| 150 | 150 |
#region 컨트롤 조건 |
| ... | ... | |
| 176 | 176 |
case "ArrowTextControl": |
| 177 | 177 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowTextControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
| 178 | 178 |
(member as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 179 |
|
|
| 179 |
AngleValue = (member as ArrowTextControl).Angle; |
|
| 180 | 180 |
Observable.FromEventPattern(((ArrowTextControl)member).Base_TextBox, "LostFocus").Subscribe(a => |
| 181 | 181 |
{
|
| 182 | 182 |
TextCompensation = false; |
| ... | ... | |
| 598 | 598 |
/// </summary> |
| 599 | 599 |
/// <param name="pointset">Drawing Point</param> |
| 600 | 600 |
public void RegistryPoint(CommentUserInfo member, int cnt = 1) |
| 601 |
{
|
|
| 601 |
{
|
|
| 602 | 602 |
int count = 0; |
| 603 | 603 |
double Minx = 100000000; |
| 604 | 604 |
double Miny = 100000000; |
| ... | ... | |
| 807 | 807 |
{
|
| 808 | 808 |
Thumb thumb = sender as Thumb; |
| 809 | 809 |
|
| 810 |
Canvas.SetLeft(thumb, Canvas.GetLeft(thumb) + |
|
| 811 |
e.HorizontalChange); |
|
| 812 |
Canvas.SetTop(thumb, Canvas.GetTop(thumb) + |
|
| 813 |
e.VerticalChange); |
|
| 810 |
if (AngleValue == -90) |
|
| 811 |
{
|
|
| 812 |
Canvas.SetLeft(thumb, Canvas.GetLeft(thumb) + e.VerticalChange); |
|
| 813 |
Canvas.SetTop(thumb, Canvas.GetTop(thumb) + (-e.HorizontalChange)); |
|
| 814 |
} |
|
| 815 |
else if (AngleValue == -180) |
|
| 816 |
{
|
|
| 817 |
Canvas.SetLeft(thumb, Canvas.GetLeft(thumb) + (-e.HorizontalChange)); |
|
| 818 |
Canvas.SetTop(thumb, Canvas.GetTop(thumb) + (-e.VerticalChange)); |
|
| 819 |
} |
|
| 820 |
else if (AngleValue == -270) |
|
| 821 |
{
|
|
| 822 |
Canvas.SetLeft(thumb, Canvas.GetLeft(thumb) + (-e.VerticalChange)); |
|
| 823 |
Canvas.SetTop(thumb, Canvas.GetTop(thumb) + e.HorizontalChange); |
|
| 824 |
} |
|
| 825 |
else //(AngleValue == 0) |
|
| 826 |
{
|
|
| 827 |
Canvas.SetLeft(thumb, Canvas.GetLeft(thumb) + e.HorizontalChange); |
|
| 828 |
Canvas.SetTop(thumb, Canvas.GetTop(thumb) + e.VerticalChange); |
|
| 829 |
} |
|
| 830 |
|
|
| 814 | 831 |
|
| 815 | 832 |
Point setPoint = new Point(Canvas.GetLeft(thumb), Canvas.GetTop(thumb)); |
| 816 | 833 |
|
| ... | ... | |
| 1952 | 1969 |
multi_Undo_Data.PointSet.Add(point); |
| 1953 | 1970 |
} |
| 1954 | 1971 |
|
| 1955 |
multi_Undo_Data.Angle = AngleValue; |
|
| 1972 |
if (control.DrawingData as ArrowTextControl != null) |
|
| 1973 |
{
|
|
| 1974 |
multi_Undo_Data.Angle = AngleValue = (control.DrawingData as ArrowTextControl).Angle; |
|
| 1975 |
} |
|
| 1976 |
else |
|
| 1977 |
{
|
|
| 1978 |
multi_Undo_Data.Angle = AngleValue; |
|
| 1979 |
} |
|
| 1956 | 1980 |
|
| 1957 | 1981 |
multi_Undo_Data.Markup = control.DrawingData as CommentUserInfo; |
| 1958 | 1982 |
UndoData.Markup_List.Add(multi_Undo_Data); |
내보내기 Unified diff
