개정판 4fcb686a
issue #000 font가 적용 되지 않아 box size가 작게 출력되는 문제
Change-Id: Ie07531db96d56e8d5c2bbdbf0786d053ad39747c
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 3836 | 3836 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3837 | 3837 |
(currentControl as TextControl).ApplyTemplate(); |
| 3838 | 3838 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 3839 |
(currentControl as TextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
|
|
| 3839 |
(currentControl as TextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily);
|
|
| 3840 | 3840 |
CreateCommand.Instance.Execute(currentControl); |
| 3841 | 3841 |
} |
| 3842 | 3842 |
} |
| ... | ... | |
| 3868 | 3868 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3869 | 3869 |
(currentControl as TextControl).ApplyTemplate(); |
| 3870 | 3870 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 3871 |
(currentControl as TextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
|
|
| 3871 |
(currentControl as TextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily);
|
|
| 3872 | 3872 |
CreateCommand.Instance.Execute(currentControl); |
| 3873 | 3873 |
} |
| 3874 | 3874 |
} |
| ... | ... | |
| 3899 | 3899 |
(currentControl as TextControl).CommentAngle = Ang; |
| 3900 | 3900 |
(currentControl as TextControl).ControlType_No = 2; |
| 3901 | 3901 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3902 |
(currentControl as TextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
|
| 3903 |
|
|
| 3904 | 3902 |
(currentControl as TextControl).ApplyTemplate(); |
| 3903 |
|
|
| 3904 |
(currentControl as TextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily); |
|
| 3905 |
|
|
| 3905 | 3906 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 3906 | 3907 |
CreateCommand.Instance.Execute(currentControl); |
| 3907 | 3908 |
|
| ... | ... | |
| 3975 | 3976 |
|
| 3976 | 3977 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 3977 | 3978 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 3978 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
|
|
| 3979 |
(currentControl as ArrowTextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily);
|
|
| 3979 | 3980 |
ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible); |
| 3980 | 3981 |
|
| 3981 | 3982 |
//} |
| ... | ... | |
| 4030 | 4031 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 4031 | 4032 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 4032 | 4033 |
(currentControl as ArrowTextControl).isTrans = true; |
| 4033 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
|
|
| 4034 |
(currentControl as ArrowTextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily);
|
|
| 4034 | 4035 |
} |
| 4035 | 4036 |
} |
| 4036 | 4037 |
} |
| ... | ... | |
| 4075 | 4076 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, CanvasDrawingMouseDownPoint); |
| 4076 | 4077 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
| 4077 | 4078 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 4078 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
|
|
| 4079 |
(currentControl as ArrowTextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily);
|
|
| 4079 | 4080 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 4080 | 4081 |
(currentControl as ArrowTextControl).CommentAngle -= rotate.Angle; |
| 4081 | 4082 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| ... | ... | |
| 4132 | 4133 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 4133 | 4134 |
(currentControl as ArrowTextControl).CommentAngle -= rotate.Angle; |
| 4134 | 4135 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 4135 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
|
|
| 4136 |
(currentControl as ArrowTextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily);
|
|
| 4136 | 4137 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 4137 | 4138 |
ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible); |
| 4138 | 4139 |
|
| ... | ... | |
| 4169 | 4170 |
currentControl = new ArrowTextControl() |
| 4170 | 4171 |
{
|
| 4171 | 4172 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Cloud, |
| 4172 |
PageAngle = ViewerDataModel.Instance.PageAngle |
|
| 4173 |
PageAngle = ViewerDataModel.Instance.PageAngle, |
|
| 4174 |
ControlType = ControlType.ArrowTextCloudControl |
|
| 4173 | 4175 |
}; |
| 4174 | 4176 |
currentControl.CommentID = Commons.shortGuid(); |
| 4175 | 4177 |
currentControl.IsNew = true; |
| ... | ... | |
| 4181 | 4183 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, CanvasDrawingMouseDownPoint); |
| 4182 | 4184 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 4183 | 4185 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
| 4184 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
|
|
| 4186 |
(currentControl as ArrowTextControl).SetFontFamily((this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.SelectedValue as Markus.Fonts.MarkusFont).FontFamily);
|
|
| 4185 | 4187 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 4186 | 4188 |
(currentControl as ArrowTextControl).CommentAngle -= rotate.Angle; |
| 4187 | 4189 |
|
| ... | ... | |
| 4235 | 4237 |
|
| 4236 | 4238 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 4237 | 4239 |
(currentControl as ArrowTextControl).CommentAngle -= rotate.Angle; |
| 4238 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
|
|
| 4240 |
(currentControl as ArrowTextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily);
|
|
| 4239 | 4241 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 4240 | 4242 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 4241 | 4243 |
ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible); |
| ... | ... | |
| 4473 | 4475 |
break; |
| 4474 | 4476 |
} |
| 4475 | 4477 |
|
| 4476 |
|
|
| 4478 |
try |
|
| 4479 |
{
|
|
| 4480 |
if (currentControl is ITextControl) |
|
| 4481 |
{
|
|
| 4482 |
var textBox = currentControl.ChildrenOfType<TextBox>().Where(x=> x.Name == "PART_ArrowTextBox" || x.Name == "Base_TextBox" || x.Name == "PART_TextBox"); |
|
| 4483 |
|
|
| 4484 |
if(textBox.Count() > 0) |
|
| 4485 |
{
|
|
| 4486 |
Behaviors.SpecialcharRemove specialcharRemove = new Behaviors.SpecialcharRemove(); |
|
| 4487 |
specialcharRemove.Attach(textBox.First()); |
|
| 4488 |
} |
|
| 4489 |
else |
|
| 4490 |
{
|
|
| 4491 |
|
|
| 4492 |
} |
|
| 4493 |
|
|
| 4494 |
} |
|
| 4495 |
} |
|
| 4496 |
catch (Exception ex) |
|
| 4497 |
{
|
|
| 4498 |
System.Diagnostics.Debug.WriteLine(ex); |
|
| 4499 |
|
|
| 4500 |
} |
|
| 4501 |
|
|
| 4477 | 4502 |
if (currentControl is ArrowTextControl) |
| 4478 | 4503 |
{
|
| 4479 | 4504 |
(currentControl as ArrowTextControl).EditEnded += (snd, evt) => |
내보내기 Unified diff
