개정판 05009a0e
issue #923: 컨트롤 selecting 수정
Change-Id: I2ca4f50fabda07f65a6a1677604be5135cc1d165
| MarkupToPDF/Controls/Text/TextControl.cs | ||
|---|---|---|
| 447 | 447 |
public static readonly DependencyProperty UserIDProperty = DependencyProperty.Register( |
| 448 | 448 |
"UserID", typeof(string), typeof(TextControl), new PropertyMetadata(null)); |
| 449 | 449 |
|
| 450 |
public static readonly DependencyProperty FontColorProperty = DependencyProperty.Register( |
|
| 451 |
"FontColor", typeof(SolidColorBrush), typeof(TextControl), new PropertyMetadata(new SolidColorBrush(Colors.Red))); |
|
| 450 |
/*public static readonly DependencyProperty FontColorProperty = DependencyProperty.Register( |
|
| 451 |
"FontColor", typeof(SolidColorBrush), typeof(TextControl), new PropertyMetadata(new SolidColorBrush(Colors.Red)));*/ |
|
| 452 |
|
|
| 453 |
public static readonly DependencyProperty StrokeColorProperty = DependencyProperty.Register( |
|
| 454 |
"StrokeColor", typeof(SolidColorBrush), typeof(TextControl), new PropertyMetadata(new SolidColorBrush(Colors.Red))); |
|
| 452 | 455 |
|
| 453 | 456 |
//강인구 추가 |
| 454 | 457 |
public static readonly DependencyProperty IsHighlightProperty = DependencyProperty.Register( |
| ... | ... | |
| 472 | 475 |
public static readonly DependencyProperty PathDataProperty = DependencyProperty.Register( |
| 473 | 476 |
"PathData", typeof(Geometry), typeof(TextControl), null); |
| 474 | 477 |
|
| 478 |
|
|
| 479 |
|
|
| 475 | 480 |
public static readonly DependencyProperty PathDataInnerProperty = DependencyProperty.Register( |
| 476 | 481 |
"PathDataInner", typeof(Geometry), typeof(TextControl), null); |
| 477 | 482 |
|
| ... | ... | |
| 533 | 538 |
|
| 534 | 539 |
#region dp Properties |
| 535 | 540 |
|
| 541 |
|
|
| 542 |
public override SolidColorBrush StrokeColor |
|
| 543 |
{
|
|
| 544 |
get { return (SolidColorBrush)GetValue(StrokeColorProperty); }
|
|
| 545 |
set |
|
| 546 |
{
|
|
| 547 |
if (this.StrokeColor != value) |
|
| 548 |
{
|
|
| 549 |
SetValue(StrokeColorProperty, value); |
|
| 550 |
} |
|
| 551 |
} |
|
| 552 |
} |
|
| 553 |
|
|
| 536 | 554 |
public bool IsEditing |
| 537 | 555 |
{
|
| 538 | 556 |
get { return (bool)GetValue(IsEditingProperty); }
|
| ... | ... | |
| 710 | 728 |
} |
| 711 | 729 |
} |
| 712 | 730 |
} |
| 713 |
|
|
| 731 |
/* |
|
| 714 | 732 |
public SolidColorBrush FontColor |
| 715 | 733 |
{
|
| 716 | 734 |
get { return (SolidColorBrush)GetValue(FontColorProperty); }
|
| ... | ... | |
| 722 | 740 |
OnPropertyChanged("FontColor");
|
| 723 | 741 |
} |
| 724 | 742 |
} |
| 725 |
} |
|
| 743 |
}*/
|
|
| 726 | 744 |
|
| 727 | 745 |
public SolidColorBrush BackColor |
| 728 | 746 |
{
|
| ... | ... | |
| 1041 | 1059 |
|
| 1042 | 1060 |
if (instance.IsSelected) |
| 1043 | 1061 |
{
|
| 1044 |
instance.FontColor = new SolidColorBrush(Colors.Blue);
|
|
| 1062 |
instance.StrokeColor = new SolidColorBrush(Colors.Blue);
|
|
| 1045 | 1063 |
//instance.Base_Border.BorderBrush = new SolidColorBrush(Colors.Blue); |
| 1046 | 1064 |
} |
| 1047 | 1065 |
else |
| 1048 | 1066 |
{
|
| 1049 |
instance.FontColor = new SolidColorBrush(Colors.Red);
|
|
| 1067 |
instance.StrokeColor = new SolidColorBrush(Colors.Red);
|
|
| 1050 | 1068 |
//instance.Base_Border.BorderBrush = new SolidColorBrush(Colors.Red); |
| 1051 | 1069 |
//instance.FontColor = new SolidColorBrush(Colors.Transparent); |
| 1052 | 1070 |
//instance.Base_Border.BorderBrush = new SolidColorBrush(Colors.Transparent); |
| ... | ... | |
| 1112 | 1130 |
if (e.OldValue != e.NewValue && instance.Base_TextBlock != null) |
| 1113 | 1131 |
{
|
| 1114 | 1132 |
instance.SetValue(e.Property, e.NewValue); |
| 1115 |
instance.DrawingCloud(); |
|
| 1133 |
//instance.DrawingCloud();
|
|
| 1116 | 1134 |
} |
| 1117 | 1135 |
} |
| 1118 | 1136 |
|
| ... | ... | |
| 1122 | 1140 |
if (e.OldValue != e.NewValue && instance!= null) |
| 1123 | 1141 |
{
|
| 1124 | 1142 |
instance.SetValue(e.Property, e.NewValue); |
| 1125 |
instance.DrawingCloud(); |
|
| 1143 |
//instance.DrawingCloud();
|
|
| 1126 | 1144 |
} |
| 1127 | 1145 |
} |
| 1128 | 1146 |
|
| ... | ... | |
| 1192 | 1210 |
STemp.SizeSet = String.Format("{0}|{1}", this.LineSize.Left.ToString(), this.TextSize.ToString());
|
| 1193 | 1211 |
STemp.Text = this.Text; |
| 1194 | 1212 |
STemp.UserID = this.UserID; |
| 1195 |
STemp.FontColor = this.FontColor.Color.ToString();
|
|
| 1213 |
STemp.FontColor = this.StrokeColor.Color.ToString();
|
|
| 1196 | 1214 |
//STemp.FontColor = "#FFFFFF00"; |
| 1197 | 1215 |
|
| 1198 | 1216 |
if (this.StartPoint == new Point()) |
| ... | ... | |
| 1253 | 1271 |
ControlType_No = s.paintMethod, |
| 1254 | 1272 |
LineSize = new Thickness(Convert.ToDouble(data2.First())), |
| 1255 | 1273 |
TextSize = Convert.ToDouble(data2[1]), |
| 1256 |
FontColor = brush,
|
|
| 1274 |
StrokeColor = brush,
|
|
| 1257 | 1275 |
FontSize = 10, |
| 1258 | 1276 |
UserID = s.UserID, |
| 1259 | 1277 |
IsHighLight = s.isHighLight, |
내보내기 Unified diff
