개정판 ec052e41
fixed issue #558: 컨트롤 포인트 선택 시 오류
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 1295 | 1295 |
Undo_Event(); |
| 1296 | 1296 |
} |
| 1297 | 1297 |
|
| 1298 |
/// <summary> |
|
| 1299 |
/// start drag |
|
| 1300 |
/// </summary> |
|
| 1301 |
/// <param name="sender"></param> |
|
| 1302 |
/// <param name="e"></param> |
|
| 1298 | 1303 |
void tm_DragStarted(object sender, DragStartedEventArgs e) |
| 1299 | 1304 |
{
|
| 1300 | 1305 |
this.DraggerThumb = sender as Thumb; |
| ... | ... | |
| 1305 | 1310 |
return; |
| 1306 | 1311 |
} |
| 1307 | 1312 |
|
| 1308 |
if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb)
|
|
| 1313 |
if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb))
|
|
| 1309 | 1314 |
{
|
| 1310 | 1315 |
return; |
| 1311 | 1316 |
} |
| 1312 | 1317 |
|
| 1313 |
if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null)
|
|
| 1318 |
if ((null != ViewerDataModel.Instance.UndoDataList.LastOrDefault()) && (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List != null))
|
|
| 1314 | 1319 |
{
|
| 1315 | 1320 |
if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Markup_List.Count > 0) |
| 1316 | 1321 |
{
|
| ... | ... | |
| 1326 | 1331 |
|
| 1327 | 1332 |
private void rotate_MouseMove(object sender, MouseEventArgs e) |
| 1328 | 1333 |
{
|
| 1329 |
|
|
| 1330 |
//double LastRotateHorizontalValue = 0; |
|
| 1331 |
//double LastRotateVerticalValue = 0; |
|
| 1332 |
//double LastWidthValue = 0; |
|
| 1333 |
//double SetWidth = 0; |
|
| 1334 |
|
|
| 1335 |
|
|
| 1336 | 1334 |
if ((MemberSet.First() as AdornerMember).DrawingData.GetType().Name == "TextControl") |
| 1337 | 1335 |
{
|
| 1338 | 1336 |
if (LastRotateVerticalValue < e.GetPosition(this).X) |
내보내기 Unified diff
