개정판 05009a0e
issue #923: 컨트롤 selecting 수정
Change-Id: I2ca4f50fabda07f65a6a1677604be5135cc1d165
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 127 | 127 |
Canvas.SetZIndex(objectData, 84); |
| 128 | 128 |
try |
| 129 | 129 |
{
|
| 130 |
//ViewerDataModel.Instance.MarkupControls_USER.Remove(objectData);
|
|
| 130 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(objectData); |
|
| 131 | 131 |
this.ContainerContent.Children.Add(objectData); |
| 132 | 132 |
} |
| 133 | 133 |
catch (Exception ex) |
| ... | ... | |
| 152 | 152 |
try |
| 153 | 153 |
{
|
| 154 | 154 |
Canvas.SetZIndex(item, 80); |
| 155 |
//ViewerDataModel.Instance.MarkupControls_USER.Remove(item);
|
|
| 155 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item); |
|
| 156 | 156 |
this.ContainerContent.Children.Add(item); |
| 157 | 157 |
} |
| 158 | 158 |
catch //(Exception ex) |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2507 | 2507 |
else if ((e.LeftButton == MouseButtonState.Released) && (e.MiddleButton == MouseButtonState.Released) && |
| 2508 | 2508 |
(e.RightButton == MouseButtonState.Released) && ViewerDataModel.Instance.MarkupControls_USER.Count > 0) |
| 2509 | 2509 |
{
|
| 2510 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.ItemRect.Contains(getCurrentPoint)).FirstOrDefault();
|
|
| 2510 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault();
|
|
| 2511 | 2511 |
if(control != null) |
| 2512 | 2512 |
{
|
| 2513 | 2513 |
this.cursor = Cursors.Hand; |
| ... | ... | |
| 2811 | 2811 |
if (Flag) |
| 2812 | 2812 |
{
|
| 2813 | 2813 |
adornerSet.Add(item); |
| 2814 |
|
|
| 2814 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item); |
|
| 2815 | 2815 |
Control_Style(item); |
| 2816 | 2816 |
} |
| 2817 | 2817 |
} |
| ... | ... | |
| 3213 | 3213 |
isLeftMouseButtonDownOnWindow = true; |
| 3214 | 3214 |
} |
| 3215 | 3215 |
|
| 3216 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.ItemRect.Contains(getCurrentPoint)).FirstOrDefault();
|
|
| 3216 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault();
|
|
| 3217 | 3217 |
if (control != null) |
| 3218 | 3218 |
{
|
| 3219 | 3219 |
AdornerFinal final = null; |
| ... | ... | |
| 4975 | 4975 |
|
| 4976 | 4976 |
private void RemoveLineStroke(Point P) |
| 4977 | 4977 |
{
|
| 4978 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.ItemRect.Contains(P)).FirstOrDefault();
|
|
| 4978 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault();
|
|
| 4979 | 4979 |
if (control != null) |
| 4980 | 4980 |
{
|
| 4981 | 4981 |
UndoData = new Undo_data() |
| MarkupToPDF/Common/CommentUserInfo.cs | ||
|---|---|---|
| 18 | 18 |
|
| 19 | 19 |
public string Memo { get; set; }
|
| 20 | 20 |
public string MarkupInfoID { get; set; }
|
| 21 |
//public bool IsMouseOver { get; set; }
|
|
| 21 |
public bool IsMouseOver { get; set; }
|
|
| 22 | 22 |
public bool IsNew { get; set; }
|
| 23 | 23 |
public string CommentID { get; set; }
|
| 24 | 24 |
public string SymbolID { get; set; }
|
| ... | ... | |
| 42 | 42 |
|
| 43 | 43 |
private void CommentUserInfo_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e) |
| 44 | 44 |
{
|
| 45 |
//this.IsMouseOver = false;
|
|
| 45 |
this.IsMouseOver = false; |
|
| 46 | 46 |
if (this.StrokeColor != null) |
| 47 | 47 |
{
|
| 48 | 48 |
this.StrokeColor = this._TempBorderBrush; |
| ... | ... | |
| 52 | 52 |
|
| 53 | 53 |
private void CommentUserInfo_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e) |
| 54 | 54 |
{
|
| 55 |
//this.IsMouseOver = true;
|
|
| 55 |
this.IsMouseOver = true; |
|
| 56 | 56 |
if (this.StrokeColor != null) |
| 57 | 57 |
{
|
| 58 | 58 |
this._TempBorderBrush = this.StrokeColor; |
| MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
|---|---|---|
| 1436 | 1436 |
{
|
| 1437 | 1437 |
case ArrowTextStyleSet.Normal: |
| 1438 | 1438 |
this.BorderSize = new Thickness(0); |
| 1439 |
DrawingRect(); |
|
| 1439 | 1440 |
break; |
| 1440 | 1441 |
case ArrowTextStyleSet.Cloud: |
| 1441 | 1442 |
this.BorderSize = new Thickness(0); |
| ... | ... | |
| 1546 | 1547 |
private void DrawingRect() |
| 1547 | 1548 |
{
|
| 1548 | 1549 |
//20180906 LJY Textbox guide |
| 1549 |
|
|
| 1550 |
if(this.ArrowTextStyle == ArrowTextStyleSet.Normal) |
|
| 1551 |
{
|
|
| 1552 |
this.Base_TextBox.BorderBrush = Brushes.Transparent; |
|
| 1553 |
} |
|
| 1550 | 1554 |
if (Math.Abs(this.Angle).ToString() == "90") |
| 1551 | 1555 |
{
|
| 1552 | 1556 |
List<Point> pCloud = new List<Point>() |
| 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, |
| MarkupToPDF/Themes/generic.xaml | ||
|---|---|---|
| 328 | 328 |
|
| 329 | 329 |
</Border> |
| 330 | 330 |
|
| 331 |
<TextBlock x:Name="PART_TextPrefix" Text="" Foreground="{TemplateBinding FontColor}" Margin="-30,-30" IsHitTestVisible="False"
|
|
| 331 |
<TextBlock x:Name="PART_TextPrefix" Text="" Foreground="{TemplateBinding StrokeColor}" Margin="-30,-30" IsHitTestVisible="False"
|
|
| 332 | 332 |
FontStyle="{TemplateBinding TextStyle}" FontWeight="{TemplateBinding TextWeight}" TextDecorations="{TemplateBinding UnderLine}"
|
| 333 | 333 |
FontSize="30" FontFamily="{TemplateBinding TextFamily}" TextWrapping="Wrap"
|
| 334 | 334 |
RenderTransformOrigin="0, 0" > |
| 335 | 335 |
</TextBlock> |
| 336 | 336 |
<Border Background="Transparent"> |
| 337 | 337 |
|
| 338 |
<TextBlock x:Name="PART_TextBlock" Text="{TemplateBinding Text}" Foreground="{TemplateBinding FontColor}"
|
|
| 338 |
<TextBlock x:Name="PART_TextBlock" Text="{TemplateBinding Text}" Foreground="{TemplateBinding StrokeColor}"
|
|
| 339 | 339 |
FontStyle="{TemplateBinding TextStyle}" FontWeight="{TemplateBinding TextWeight}" TextDecorations="{TemplateBinding UnderLine}"
|
| 340 | 340 |
FontSize="{TemplateBinding TextSize}" FontFamily="{TemplateBinding TextFamily}" TextWrapping="Wrap" Padding="2" Margin="2,0,0,0"
|
| 341 | 341 |
Visibility="{Binding TextBlockVisibility, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
|
| ... | ... | |
| 343 | 343 |
</TextBlock> |
| 344 | 344 |
</Border> |
| 345 | 345 |
|
| 346 |
<TextBox x:Name="PART_TextBox" Text="{TemplateBinding Text}" Foreground="{TemplateBinding FontColor}" IsTabStop="False" AcceptsTab="False"
|
|
| 346 |
<TextBox x:Name="PART_TextBox" Text="{TemplateBinding Text}" Foreground="{TemplateBinding StrokeColor}" IsTabStop="False" AcceptsTab="False"
|
|
| 347 | 347 |
Visibility="{Binding TextBoxVisibility, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Padding="2"
|
| 348 | 348 |
TextWrapping="Wrap" Background="{TemplateBinding BackColor}" FontSize="{TemplateBinding TextSize}" AcceptsReturn="True"
|
| 349 | 349 |
FontFamily="{TemplateBinding TextFamily}" FontStyle="{TemplateBinding TextStyle}" FontWeight="{TemplateBinding TextWeight}"
|
| ... | ... | |
| 366 | 366 |
</Path.RenderTransform> |
| 367 | 367 |
</Path> |
| 368 | 368 |
|
| 369 |
<Path x:Name="PART_TextPath" Stroke="{TemplateBinding FontColor}" Data="{TemplateBinding PathData}" RenderTransformOrigin="0,0" Canvas.ZIndex="1">
|
|
| 369 |
<Path x:Name="PART_TextPath" Stroke="{TemplateBinding StrokeColor}" Data="{TemplateBinding PathData}" RenderTransformOrigin="0,0" Canvas.ZIndex="1">
|
|
| 370 | 370 |
<Path.Fill> |
| 371 | 371 |
<SolidColorBrush Color="{TemplateBinding BackInnerColor}" Opacity="0.6"/>
|
| 372 | 372 |
</Path.Fill> |
내보내기 Unified diff
