개정판 f7ca524b
Fix: 텍스트 컨트롤의 Cloud Mark 크기 조절 오류 수정
Change-Id: Idbcb94c257f6c3ece2a39089c7802ab10d03e21a
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1789 | 1789 |
{
|
| 1790 | 1790 |
(currentControl as IShapeControl).Paint = ViewerDataModel.Instance.paintSet; |
| 1791 | 1791 |
} |
| 1792 |
if ((currentControl as TextControl) != null)
|
|
| 1792 |
if (currentControl is TextControl TextCtrl)
|
|
| 1793 | 1793 |
{
|
| 1794 | 1794 |
if (this.ParentOfType<MainWindow>().dzTopMenu.btnItalic.IsChecked == true) |
| 1795 | 1795 |
{
|
| 1796 |
(currentControl as TextControl).TextStyle = FontStyles.Italic;
|
|
| 1796 |
TextCtrl.TextStyle = FontStyles.Italic;
|
|
| 1797 | 1797 |
} |
| 1798 | 1798 |
if (this.ParentOfType<MainWindow>().dzTopMenu.btnBold.IsChecked == true) |
| 1799 | 1799 |
{
|
| 1800 |
(currentControl as TextControl).TextWeight = FontWeights.Bold;
|
|
| 1800 |
TextCtrl.TextWeight = FontWeights.Bold;
|
|
| 1801 | 1801 |
} |
| 1802 | 1802 |
if (this.ParentOfType<MainWindow>().dzTopMenu.btnUnderLine.IsChecked == true) |
| 1803 | 1803 |
{
|
| 1804 |
(currentControl as TextControl).UnderLine = TextDecorations.Underline;
|
|
| 1804 |
TextCtrl.UnderLine = TextDecorations.Underline;
|
|
| 1805 | 1805 |
} |
| 1806 |
|
|
| 1807 |
TextCtrl.ArcLength = ViewerDataModel.Instance.ArcLength; |
|
| 1806 | 1808 |
} |
| 1807 | 1809 |
else if ((currentControl as ArrowTextControl) != null) |
| 1808 | 1810 |
{
|
| ... | ... | |
| 1819 | 1821 |
(currentControl as ArrowTextControl).UnderLine = TextDecorations.Underline; |
| 1820 | 1822 |
} |
| 1821 | 1823 |
} |
| 1822 |
else if ((currentControl as RectCloudControl) != null)
|
|
| 1824 |
else if (currentControl is RectCloudControl RectCloudCtrl)
|
|
| 1823 | 1825 |
{
|
| 1824 |
(currentControl as RectCloudControl).ArcLength = ViewerDataModel.Instance.ArcLength;
|
|
| 1826 |
RectCloudCtrl.ArcLength = ViewerDataModel.Instance.ArcLength;
|
|
| 1825 | 1827 |
} |
| 1826 |
else if ((currentControl as CloudControl) != null)
|
|
| 1828 |
else if (currentControl is CloudControl CloudCtrl)
|
|
| 1827 | 1829 |
{
|
| 1828 |
(currentControl as CloudControl).ArcLength = ViewerDataModel.Instance.ArcLength;
|
|
| 1830 |
CloudCtrl.ArcLength = ViewerDataModel.Instance.ArcLength;
|
|
| 1829 | 1831 |
} |
| 1830 | 1832 |
|
| 1831 | 1833 |
#region // 모든 컨트롤의 공통기능 제어 |
| ... | ... | |
| 2996 | 2998 |
|
| 2997 | 2999 |
ViewerDataModel.Instance.ControlOpacity = control.Opacity; |
| 2998 | 3000 |
|
| 2999 |
if ((control as TextControl) != null)
|
|
| 3001 |
if (control is TextControl TextCtrl)
|
|
| 3000 | 3002 |
{
|
| 3001 |
ViewerDataModel.Instance.SystemMain.dzTopMenu.SetFont((control as TextControl).TextFamily);
|
|
| 3003 |
ViewerDataModel.Instance.SystemMain.dzTopMenu.SetFont(TextCtrl.TextFamily);
|
|
| 3002 | 3004 |
|
| 3003 |
if (!((control as TextControl).EnableEditing))
|
|
| 3005 |
if (!(TextCtrl.EnableEditing))
|
|
| 3004 | 3006 |
{
|
| 3005 |
(control as TextControl).EnableEditing = true;
|
|
| 3007 |
TextCtrl.EnableEditing = true;
|
|
| 3006 | 3008 |
} |
| 3007 |
if ((control as TextControl).TextStyle == FontStyles.Italic)
|
|
| 3009 |
if (TextCtrl.TextStyle == FontStyles.Italic)
|
|
| 3008 | 3010 |
{
|
| 3009 | 3011 |
ViewerDataModel.Instance.checkTextStyle = true; |
| 3010 | 3012 |
} |
| ... | ... | |
| 3012 | 3014 |
{
|
| 3013 | 3015 |
ViewerDataModel.Instance.checkTextStyle = false; |
| 3014 | 3016 |
} |
| 3015 |
if ((control as TextControl).TextWeight == FontWeights.Bold)
|
|
| 3017 |
if (TextCtrl.TextWeight == FontWeights.Bold)
|
|
| 3016 | 3018 |
{
|
| 3017 | 3019 |
ViewerDataModel.Instance.checkTextWeight = true; |
| 3018 | 3020 |
} |
| ... | ... | |
| 3020 | 3022 |
{
|
| 3021 | 3023 |
ViewerDataModel.Instance.checkTextWeight = false; |
| 3022 | 3024 |
} |
| 3023 |
if ((control as TextControl).UnderLine == TextDecorations.Underline)
|
|
| 3025 |
if (TextCtrl.UnderLine == TextDecorations.Underline)
|
|
| 3024 | 3026 |
{
|
| 3025 | 3027 |
ViewerDataModel.Instance.checkUnderLine = true; |
| 3026 | 3028 |
} |
| ... | ... | |
| 3028 | 3030 |
{
|
| 3029 | 3031 |
ViewerDataModel.Instance.checkUnderLine = false; |
| 3030 | 3032 |
} |
| 3031 |
ViewerDataModel.Instance.TextSize = (control as TextControl).TextSize; |
|
| 3032 |
ViewerDataModel.Instance.checkHighlight = (control as TextControl).IsHighLight; |
|
| 3033 |
ViewerDataModel.Instance.TextSize = TextCtrl.TextSize; |
|
| 3034 |
ViewerDataModel.Instance.checkHighlight = TextCtrl.IsHighLight; |
|
| 3035 |
ViewerDataModel.Instance.ArcLength = TextCtrl.ArcLength; |
|
| 3033 | 3036 |
} |
| 3034 | 3037 |
else if ((control as ArrowTextControl) != null) |
| 3035 | 3038 |
{
|
| ... | ... | |
| 3066 | 3069 |
ViewerDataModel.Instance.checkHighlight = (control as ArrowTextControl).isHighLight; |
| 3067 | 3070 |
ViewerDataModel.Instance.TextSize = (control as ArrowTextControl).TextSize; |
| 3068 | 3071 |
} |
| 3069 |
else if ((control as RectCloudControl) != null)
|
|
| 3072 |
else if (control is RectCloudControl RectCloudCtrl)
|
|
| 3070 | 3073 |
{
|
| 3071 |
ViewerDataModel.Instance.ArcLength = (control as RectCloudControl).ArcLength;
|
|
| 3074 |
ViewerDataModel.Instance.ArcLength = RectCloudCtrl.ArcLength;
|
|
| 3072 | 3075 |
} |
| 3073 |
else if ((control as CloudControl) != null)
|
|
| 3076 |
else if (control is CloudControl CloudCtrl)
|
|
| 3074 | 3077 |
{
|
| 3075 |
ViewerDataModel.Instance.ArcLength = (control as CloudControl).ArcLength;
|
|
| 3078 |
ViewerDataModel.Instance.ArcLength = CloudCtrl.ArcLength;
|
|
| 3076 | 3079 |
} |
| 3077 | 3080 |
} |
| 3078 | 3081 |
else |
내보내기 Unified diff
