개정판 05009a0e
issue #923: 컨트롤 selecting 수정
Change-Id: I2ca4f50fabda07f65a6a1677604be5135cc1d165
| 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() |
내보내기 Unified diff
