개정판 b79d6e7f
Fix: ArrowTextControl, TextControl에 ArcLength 적용
Change-Id: I02e837c6e9e97fc48008ee3753012f8025414ffb
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
151 | 151 |
public string Filename_ { get; set; } |
152 | 152 |
public double L_Size = 0; |
153 | 153 |
public AdornerFinal adorner_; |
154 |
public Multi_UndoData multi_UndoData;
|
|
154 |
public UndoData multi_UndoData; |
|
155 | 155 |
public string Symbol_ID = ""; |
156 | 156 |
|
157 | 157 |
/// <summary> |
... | ... | |
2775 | 2775 |
currentControl.EndPoint, |
2776 | 2776 |
currentControl.TopRightPoint, |
2777 | 2777 |
}; |
2778 |
Multi_UndoData multi_UndoData = new Multi_UndoData();
|
|
2778 |
UndoData multi_UndoData = new UndoData();
|
|
2779 | 2779 |
UndoDataGroup = new UndoDataGroup() |
2780 | 2780 |
{ |
2781 | 2781 |
IsUndo = false, |
2782 | 2782 |
Event = EventType.Create, |
2783 | 2783 |
EventTime = DateTime.Now, |
2784 |
MarkupDataColl = new List<Multi_UndoData>()
|
|
2784 |
MarkupDataColl = new List<UndoData>() |
|
2785 | 2785 |
}; |
2786 | 2786 |
ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i => |
2787 | 2787 |
{ |
... | ... | |
3066 | 3066 |
ViewerDataModel.Instance.checkHighlight = TextCtrl.IsHighLight; |
3067 | 3067 |
ViewerDataModel.Instance.ArcLength = TextCtrl.ArcLength; |
3068 | 3068 |
} |
3069 |
else if ((control as ArrowTextControl) != null)
|
|
3069 |
else if (control is ArrowTextControl ArrowTextCtrl)
|
|
3070 | 3070 |
{ |
3071 | 3071 |
ViewerDataModel.Instance.SystemMain.dzTopMenu.SetFont((control as ArrowTextControl).TextFamily); |
3072 | 3072 |
|
3073 | 3073 |
if (!((control as ArrowTextControl).EnableEditing)) |
3074 | 3074 |
{ |
3075 |
(control as ArrowTextControl).EnableEditing = true;
|
|
3075 |
ArrowTextCtrl.EnableEditing = true;
|
|
3076 | 3076 |
} |
3077 | 3077 |
if ((control as ArrowTextControl).TextStyle == FontStyles.Italic) |
3078 | 3078 |
{ |
... | ... | |
3098 | 3098 |
{ |
3099 | 3099 |
ViewerDataModel.Instance.checkUnderLine = false; |
3100 | 3100 |
} |
3101 |
ViewerDataModel.Instance.checkHighlight = (control as ArrowTextControl).isHighLight; |
|
3102 |
ViewerDataModel.Instance.TextSize = (control as ArrowTextControl).TextSize; |
|
3101 |
ViewerDataModel.Instance.checkHighlight = ArrowTextCtrl.isHighLight; |
|
3102 |
ViewerDataModel.Instance.TextSize = ArrowTextCtrl.TextSize; |
|
3103 |
ViewerDataModel.Instance.ArcLength = ArrowTextCtrl.ArcLength; |
|
3103 | 3104 |
} |
3104 | 3105 |
else if (control is RectCloudControl RectCloudCtrl) |
3105 | 3106 |
{ |
... | ... | |
6140 | 6141 |
|
6141 | 6142 |
#endregion 캡쳐 기능 |
6142 | 6143 |
|
6143 |
public Multi_UndoData Control_Style(CommentUserInfo control)
|
|
6144 |
public UndoData Control_Style(CommentUserInfo control) |
|
6144 | 6145 |
{ |
6145 |
multi_UndoData = new Multi_UndoData();
|
|
6146 |
multi_UndoData = new UndoData(); |
|
6146 | 6147 |
|
6147 | 6148 |
multi_UndoData.Markup = control; |
6148 | 6149 |
|
내보내기 Unified diff