개정판 1066bae3
issue #923 Select Control edit
Change-Id: Ic24089c392a187d3635fb1fb006fc9bf758e3d5c
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2527 | 2527 |
else if ((e.LeftButton == MouseButtonState.Released) && (e.MiddleButton == MouseButtonState.Released) && |
| 2528 | 2528 |
(e.RightButton == MouseButtonState.Released) && ViewerDataModel.Instance.MarkupControls_USER.Count > 0) |
| 2529 | 2529 |
{
|
| 2530 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault();
|
|
| 2530 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.ItemRect.Contains(getCurrentPoint)).FirstOrDefault();
|
|
| 2531 | 2531 |
if(control != null) |
| 2532 | 2532 |
{
|
| 2533 | 2533 |
this.cursor = Cursors.Hand; |
| ... | ... | |
| 2831 | 2831 |
if (Flag) |
| 2832 | 2832 |
{
|
| 2833 | 2833 |
adornerSet.Add(item); |
| 2834 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item); |
|
| 2835 | 2834 |
|
| 2836 | 2835 |
Control_Style(item); |
| 2837 | 2836 |
} |
| ... | ... | |
| 3232 | 3231 |
{
|
| 3233 | 3232 |
//dragSelectionBorder.Visibility = Visibility.Visible; |
| 3234 | 3233 |
isLeftMouseButtonDownOnWindow = true; |
| 3235 |
}
|
|
| 3234 |
} |
|
| 3236 | 3235 |
|
| 3237 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault();
|
|
| 3236 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.ItemRect.Contains(getCurrentPoint)).FirstOrDefault();
|
|
| 3238 | 3237 |
if (control != null) |
| 3239 | 3238 |
{
|
| 3240 | 3239 |
AdornerFinal final = null; |
| ... | ... | |
| 4312 | 4311 |
currentControl.IsNew = true; |
| 4313 | 4312 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4314 | 4313 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4315 |
currentControl.SetValue(Canvas.ZIndexProperty, 2); |
|
| 4314 |
currentControl.SetValue(Canvas.ZIndexProperty, 3); |
|
| 4315 |
|
|
| 4316 | 4316 |
currentControl.SetValue(TextControl.CanvasXProperty, canvasDrawingMouseDownPoint.X); |
| 4317 | 4317 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y); |
| 4318 | 4318 |
|
| ... | ... | |
| 4322 | 4322 |
(currentControl as TextControl).ApplyTemplate(); |
| 4323 | 4323 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 4324 | 4324 |
|
| 4325 |
//System.Diagnostics.Debug.WriteLine("CanvasX" + (currentControl as TextControl).CanvasX);
|
|
| 4326 |
//System.Diagnostics.Debug.WriteLine("CanvasY" + (currentControl as TextControl).CanvasY);
|
|
| 4327 |
|
|
| 4325 | 4328 |
CreateControl(); |
| 4326 | 4329 |
|
| 4327 | 4330 |
} |
| ... | ... | |
| 4992 | 4995 |
|
| 4993 | 4996 |
private void RemoveLineStroke(Point P) |
| 4994 | 4997 |
{
|
| 4995 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault();
|
|
| 4998 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.ItemRect.Contains(P)).FirstOrDefault();
|
|
| 4996 | 4999 |
if (control != null) |
| 4997 | 5000 |
{
|
| 4998 | 5001 |
UndoData = new Undo_data() |
내보내기 Unified diff
