개정판 55d4f382
issue #923
1.TextControl, ArrowTextControl에 SetFontFamily 함수를 만들고, 선택된 아이템에 대해서 TopMenu에 Font가 바뀌면 SetFontFamily을 호출하여 각 컨트롤마다 폰트를 바뀌게한다.
2.TextControl, ArrowTextControl을 생성할 때 SetFontFamily 함수를 호출하여 컨트롤에 Font를 Apply한다.
Change-Id: I242c6ba4db930307f06890a82ebf272c7dbf0bdc
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 3265 | 3265 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3266 | 3266 |
(currentControl as TextControl).ApplyTemplate(); |
| 3267 | 3267 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 3268 |
|
|
| 3268 |
(currentControl as TextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
|
| 3269 | 3269 |
CreateCommand.Instance.Execute(currentControl); |
| 3270 | 3270 |
} |
| 3271 | 3271 |
} |
| ... | ... | |
| 3296 | 3296 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3297 | 3297 |
(currentControl as TextControl).ApplyTemplate(); |
| 3298 | 3298 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 3299 |
(currentControl as TextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
|
| 3299 | 3300 |
CreateCommand.Instance.Execute(currentControl); |
| 3300 | 3301 |
} |
| 3301 | 3302 |
} |
| ... | ... | |
| 3328 | 3329 |
(currentControl as TextControl).ApplyTemplate(); |
| 3329 | 3330 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 3330 | 3331 |
CreateCommand.Instance.Execute(currentControl); |
| 3332 |
(currentControl as TextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
|
| 3331 | 3333 |
//currentControl = null; |
| 3332 | 3334 |
} |
| 3333 | 3335 |
} |
| ... | ... | |
| 3373 | 3375 |
|
| 3374 | 3376 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 3375 | 3377 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 3378 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
|
| 3376 | 3379 |
this.MainAngle.Visibility = Visibility.Visible; |
| 3377 | 3380 |
|
| 3378 | 3381 |
|
| ... | ... | |
| 3394 | 3397 |
} |
| 3395 | 3398 |
|
| 3396 | 3399 |
CreateCommand.Instance.Execute(currentControl); |
| 3400 |
|
|
| 3397 | 3401 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 3402 |
|
|
| 3398 | 3403 |
currentControl.IsNew = false; |
| 3399 | 3404 |
currentControl = null; |
| 3400 | 3405 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| ... | ... | |
| 3424 | 3429 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 3425 | 3430 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 3426 | 3431 |
(currentControl as ArrowTextControl).isTrans = true; |
| 3432 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
|
| 3427 | 3433 |
} |
| 3428 | 3434 |
} |
| 3429 | 3435 |
} |
| ... | ... | |
| 3466 | 3472 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, canvasDrawingMouseDownPoint); |
| 3467 | 3473 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3468 | 3474 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 3469 |
|
|
| 3475 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
|
| 3470 | 3476 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3471 | 3477 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
| 3472 | 3478 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| ... | ... | |
| 3492 | 3498 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 3493 | 3499 |
currentControl.IsNew = false; |
| 3494 | 3500 |
currentControl = null; |
| 3501 |
|
|
| 3495 | 3502 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3496 | 3503 |
} |
| 3497 | 3504 |
else |
| ... | ... | |
| 3522 | 3529 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3523 | 3530 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
| 3524 | 3531 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 3525 |
|
|
| 3532 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
|
| 3526 | 3533 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 3527 | 3534 |
this.MainAngle.Visibility = Visibility.Visible; |
| 3528 | 3535 |
|
| ... | ... | |
| 3570 | 3577 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, canvasDrawingMouseDownPoint); |
| 3571 | 3578 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 3572 | 3579 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3573 |
|
|
| 3580 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
|
| 3574 | 3581 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3575 | 3582 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
| 3576 | 3583 |
|
| ... | ... | |
| 3623 | 3630 |
|
| 3624 | 3631 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3625 | 3632 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
| 3626 |
|
|
| 3633 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
|
| 3627 | 3634 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 3628 | 3635 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 3629 | 3636 |
this.MainAngle.Visibility = Visibility.Visible; |
내보내기 Unified diff
