개정판 e17af42b
ArrowTextControl UnderLine추가
ArrowTextControl 속성 이벤트 변경 추가
| FinalService/KCOM_FinalService/ConsoleApp1/Program.cs | ||
|---|---|---|
| 58 | 58 |
{
|
| 59 | 59 |
|
| 60 | 60 |
//FINAL_PDF item = _entity.FINAL_PDF.Where(d => d.ID == "ngKwBgMotw8d56dea3839120d").FirstOrDefault(); |
| 61 |
FINAL_PDF item = _entity.FINAL_PDF.Where(d => d.ID == "fqp6fPNCil8d5a422811f911a").FirstOrDefault();
|
|
| 61 |
FINAL_PDF item = _entity.FINAL_PDF.Where(d => d.ID == "Fu6YnWN2fO8d5a43e9de1d867").FirstOrDefault();
|
|
| 62 | 62 |
//_entity.FINAL_PDF.AddObject(new FINAL_PDF |
| 63 | 63 |
//{
|
| 64 | 64 |
// ID = Guid.NewGuid().ToString(), |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 3068 | 3068 |
} |
| 3069 | 3069 |
else if ((control as ArrowTextControl) != null) |
| 3070 | 3070 |
{
|
| 3071 |
if (this.ParentOfType<MainWindow>().dzTopMenu.btnItalic.IsChecked == true) |
|
| 3071 |
//if (this.ParentOfType<MainWindow>().dzTopMenu.btnItalic.IsChecked == true) |
|
| 3072 |
//{
|
|
| 3073 |
// (control as ArrowTextControl).TextStyle = FontStyles.Italic; |
|
| 3074 |
//} |
|
| 3075 |
//if (this.ParentOfType<MainWindow>().dzTopMenu.btnBold.IsChecked == true) |
|
| 3076 |
//{
|
|
| 3077 |
// (control as ArrowTextControl).TextWeight = FontWeights.Bold; |
|
| 3078 |
//} |
|
| 3079 |
//if (this.ParentOfType<MainWindow>().dzTopMenu.btnUnderLine.IsChecked == true) |
|
| 3080 |
//{
|
|
| 3081 |
// (control as ArrowTextControl).UnderLine = TextDecorations.Underline; |
|
| 3082 |
//} |
|
| 3083 |
if ((control as ArrowTextControl).TextStyle == FontStyles.Italic) |
|
| 3072 | 3084 |
{
|
| 3073 |
(control as ArrowTextControl).TextStyle = FontStyles.Italic; |
|
| 3085 |
ViewerDataModel.Instance.checkTextStyle = true; |
|
| 3086 |
} |
|
| 3087 |
else |
|
| 3088 |
{
|
|
| 3089 |
ViewerDataModel.Instance.checkTextStyle = false; |
|
| 3090 |
} |
|
| 3091 |
|
|
| 3092 |
if ((control as ArrowTextControl).TextStyle == FontStyles.Italic) |
|
| 3093 |
{
|
|
| 3094 |
ViewerDataModel.Instance.checkTextStyle = true; |
|
| 3074 | 3095 |
} |
| 3075 |
if (this.ParentOfType<MainWindow>().dzTopMenu.btnBold.IsChecked == true)
|
|
| 3096 |
else
|
|
| 3076 | 3097 |
{
|
| 3077 |
(control as ArrowTextControl).TextWeight = FontWeights.Bold;
|
|
| 3098 |
ViewerDataModel.Instance.checkTextStyle = false;
|
|
| 3078 | 3099 |
} |
| 3079 |
if (this.ParentOfType<MainWindow>().dzTopMenu.btnUnderLine.IsChecked == true)
|
|
| 3100 |
if ((control as ArrowTextControl).TextWeight == FontWeights.Bold)
|
|
| 3080 | 3101 |
{
|
| 3081 |
(control as ArrowTextControl).UnderLine = TextDecorations.Underline; |
|
| 3102 |
ViewerDataModel.Instance.checkTextWeight = true; |
|
| 3103 |
} |
|
| 3104 |
else |
|
| 3105 |
{
|
|
| 3106 |
ViewerDataModel.Instance.checkTextWeight = false; |
|
| 3107 |
} |
|
| 3108 |
if ((control as ArrowTextControl).UnderLine == TextDecorations.Underline) |
|
| 3109 |
{
|
|
| 3110 |
ViewerDataModel.Instance.checkUnderLine = true; |
|
| 3111 |
} |
|
| 3112 |
else |
|
| 3113 |
{
|
|
| 3114 |
ViewerDataModel.Instance.checkUnderLine = false; |
|
| 3082 | 3115 |
} |
| 3083 | 3116 |
ViewerDataModel.Instance.checkHighlight = (control as ArrowTextControl).isHighLight; |
| 3084 | 3117 |
ViewerDataModel.Instance.TextSize = (control as ArrowTextControl).TextSize; |
| MarkupToPDF/Controls/Parsing/MarkupCopy.cs | ||
|---|---|---|
| 985 | 985 |
instance.TextWeight.ToString(), |
| 986 | 986 |
instance.TextSize.ToString(), |
| 987 | 987 |
}; |
| 988 |
|
|
| 989 |
if (instance.UnderLine != null) |
|
| 990 |
{
|
|
| 991 |
STemp.fontConfig.Add("true");
|
|
| 992 |
} |
|
| 993 |
|
|
| 988 | 994 |
///강인구 추가(2017.11.02) |
| 989 | 995 |
///Memo 추가 |
| 990 | 996 |
STemp.Memo = instance.Memo; |
| ... | ... | |
| 1574 | 1580 |
instance.TextWeight.ToString(), |
| 1575 | 1581 |
instance.TextSize.ToString(), |
| 1576 | 1582 |
}; |
| 1583 |
|
|
| 1584 |
if (instance.UnderLine != null) |
|
| 1585 |
{
|
|
| 1586 |
STemp.fontConfig.Add("true");
|
|
| 1587 |
} |
|
| 1588 |
|
|
| 1577 | 1589 |
ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize())); |
| 1578 | 1590 |
}; |
| 1579 | 1591 |
break; |
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 3202 | 3202 |
instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
| 3203 | 3203 |
instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
| 3204 | 3204 |
instance.TextSize = Convert.ToDouble(s.fontConfig[3]); |
| 3205 |
|
|
| 3205 | 3206 |
instance.ApplyTemplate(); |
| 3207 |
|
|
| 3208 |
if (s.fontConfig.Count() == 5) |
|
| 3209 |
{
|
|
| 3210 |
instance.UnderLine = TextDecorations.Underline; |
|
| 3211 |
instance.Base_TextBox.TextDecorations = instance.UnderLine; |
|
| 3212 |
} |
|
| 3206 | 3213 |
instance.SetArrowTextPath(); |
| 3214 |
|
|
| 3207 | 3215 |
instance.SetValue(ToolTipService.ToolTipProperty, ToolTipMessage); |
| 3208 | 3216 |
}; |
| 3209 | 3217 |
break; |
| ... | ... | |
| 3460 | 3468 |
instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
| 3461 | 3469 |
instance.TextSize = Convert.ToDouble(s.fontConfig[3]); |
| 3462 | 3470 |
instance.ApplyTemplate(); |
| 3471 |
|
|
| 3472 |
if (s.fontConfig.Count() == 5) |
|
| 3473 |
{
|
|
| 3474 |
instance.UnderLine = TextDecorations.Underline; |
|
| 3475 |
instance.Base_TextBox.TextDecorations = instance.UnderLine; |
|
| 3476 |
} |
|
| 3463 | 3477 |
instance.SetArrowTextPath(); |
| 3464 | 3478 |
instance.SetValue(ToolTipService.ToolTipProperty, ToolTipMessage); |
| 3465 | 3479 |
}; |
| ... | ... | |
| 4138 | 4152 |
instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
| 4139 | 4153 |
instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
| 4140 | 4154 |
instance.TextSize = Convert.ToDouble(s.fontConfig[3]); |
| 4155 |
|
|
| 4156 |
if (s.fontConfig.Count() == 5) |
|
| 4157 |
{
|
|
| 4158 |
instance.UnderLine = TextDecorations.Underline; |
|
| 4159 |
instance.Base_TextBox.TextDecorations = instance.UnderLine; |
|
| 4160 |
} |
|
| 4161 |
|
|
| 4141 | 4162 |
instance.SetArrowTextPath(); |
| 4142 | 4163 |
instance.Base_TextBox.IsHitTestVisible = false; |
| 4143 | 4164 |
instance.CommentID = commentId; |
| ... | ... | |
| 5115 | 5136 |
instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
| 5116 | 5137 |
instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
| 5117 | 5138 |
instance.TextSize = Convert.ToDouble(s.fontConfig[3]); |
| 5139 |
|
|
| 5118 | 5140 |
baseLayer.Add(instance); |
| 5119 | 5141 |
instance.ApplyTemplate(); |
| 5142 |
|
|
| 5143 |
if (s.fontConfig.Count() == 5) |
|
| 5144 |
{
|
|
| 5145 |
instance.UnderLine = TextDecorations.Underline; |
|
| 5146 |
instance.Base_TextBox.TextDecorations = instance.UnderLine; |
|
| 5147 |
} |
|
| 5120 | 5148 |
instance.SetArrowTextPath(); |
| 5121 | 5149 |
return_control = instance; |
| 5122 | 5150 |
}; |
| MarkupToPDF/Themes/generic.xaml | ||
|---|---|---|
| 439 | 439 |
FontFamily="{TemplateBinding TextFamily}"
|
| 440 | 440 |
FontStyle="{TemplateBinding TextStyle}"
|
| 441 | 441 |
FontWeight="{TemplateBinding TextWeight}"
|
| 442 |
TextDecorations="{TemplateBinding UnderLine}"
|
|
| 442 | 443 |
AcceptsReturn="True" |
| 443 | 444 |
Foreground="{TemplateBinding StrokeColor}"
|
| 444 | 445 |
HorizontalAlignment="Stretch" |
내보내기 Unified diff
