개정판 4fcb686a
issue #000 font가 적용 되지 않아 box size가 작게 출력되는 문제
Change-Id: Ie07531db96d56e8d5c2bbdbf0786d053ad39747c
| MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
|---|---|---|
| 68 | 68 |
Base_ArrowSubPath = GetTemplateChild(PART_ArrowSubPath) as Path; |
| 69 | 69 |
Base_TextBox = GetTemplateChild(PART_TextBox) as TextBox; |
| 70 | 70 |
BaseTextbox_Caret = GetTemplateChild(PART_BaseTextbox_Caret) as Border; |
| 71 |
|
|
| 71 |
Base_TextBox.FontFamily = this.TextFamily; |
|
| 72 | 72 |
if (Base_TextBox != null) |
| 73 | 73 |
{
|
| 74 | 74 |
this.Base_TextBox.CaretIndex = this.Base_TextBox.Text.Length; |
| 75 | 75 |
this.Base_TextBox.CaretBrush = new SolidColorBrush(Colors.Transparent); |
| 76 |
|
|
| 77 |
if (this.ArrowTextStyle == ArrowTextStyleSet.Cloud) |
|
| 78 |
{
|
|
| 79 |
|
|
| 80 |
} |
|
| 81 |
|
|
| 76 | 82 |
this.Base_TextBox.ApplyTemplate(); |
| 77 | 83 |
this.Base_TextBox.Text = this.ArrowText; |
| 78 | 84 |
|
| ... | ... | |
| 105 | 111 |
|
| 106 | 112 |
public void SetFontFamily(FontFamily fontFamily) |
| 107 | 113 |
{
|
| 114 |
if (this.Base_TextBlock != null) |
|
| 115 |
{
|
|
| 116 |
this.Base_TextBlock.FontFamily = fontFamily; |
|
| 117 |
} |
|
| 118 |
|
|
| 119 |
if (this.Base_TextBox != null) |
|
| 120 |
{
|
|
| 121 |
this.Base_TextBox.FontFamily = fontFamily; |
|
| 122 |
} |
|
| 108 | 123 |
this.FontFamily = fontFamily; |
| 109 | 124 |
this.TextFamily = fontFamily; |
| 110 | 125 |
} |
| ... | ... | |
| 1342 | 1357 |
break; |
| 1343 | 1358 |
default: |
| 1344 | 1359 |
{
|
| 1345 |
this.BorderSize = new Thickness(LineSize); //올라
|
|
| 1360 |
this.BorderSize = new Thickness(LineSize); |
|
| 1346 | 1361 |
DrawingRect(); |
| 1347 | 1362 |
} |
| 1348 | 1363 |
|
| ... | ... | |
| 1430 | 1445 |
|
| 1431 | 1446 |
}//20180906 LJY Textbox guide |
| 1432 | 1447 |
else |
| 1433 |
{
|
|
| 1448 |
{
|
|
| 1449 |
var boxWidth = BoxWidth; |
|
| 1450 |
System.Diagnostics.Debug.WriteLine("disp Width : " + BoxWidth);
|
|
| 1451 |
//boxWidth = boxWidth + Base_TextBox.Margin.Left + Base_TextBox.Margin.Right + Base_TextBox.Padding.Left + Base_TextBox.Padding.Right; |
|
| 1452 |
|
|
| 1434 | 1453 |
List<Point> pCloud = new List<Point>() |
| 1435 | 1454 |
{
|
| 1436 | 1455 |
#if SILVERLIGHT |
| ... | ... | |
| 1443 | 1462 |
#else |
| 1444 | 1463 |
new Point(Canvas.GetLeft(Base_TextBox), Canvas.GetTop(Base_TextBox)), //위 |
| 1445 | 1464 |
new Point(Canvas.GetLeft(Base_TextBox), Canvas.GetTop(Base_TextBox)+ BoxHeight), //왼쪽 아래 |
| 1446 |
new Point(Canvas.GetLeft(Base_TextBox)+ BoxWidth, Canvas.GetTop(Base_TextBox) + BoxHeight),
|
|
| 1447 |
new Point(Canvas.GetLeft(Base_TextBox) + BoxWidth, Canvas.GetTop(Base_TextBox)),
|
|
| 1465 |
new Point(Canvas.GetLeft(Base_TextBox)+ boxWidth, Canvas.GetTop(Base_TextBox) + BoxHeight),
|
|
| 1466 |
new Point(Canvas.GetLeft(Base_TextBox) + boxWidth, Canvas.GetTop(Base_TextBox)),
|
|
| 1448 | 1467 |
new Point(Canvas.GetLeft(Base_TextBox), Canvas.GetTop(Base_TextBox)), //위 |
| 1449 | 1468 |
|
| 1450 | 1469 |
//new Point(Canvas.GetLeft(Base_TextBox), Canvas.GetTop(Base_TextBox)), //위 |
| ... | ... | |
| 1874 | 1893 |
instance.StartPoint = s.StartPoint; |
| 1875 | 1894 |
instance.EndPoint = s.EndPoint; |
| 1876 | 1895 |
instance.StrokeColor = brush; |
| 1877 |
//instance.DashSize = s.DashSize; |
|
| 1896 |
//instance.DashSize = s.DashSize;
|
|
| 1878 | 1897 |
instance.ArrowTextStyle = s.ArrowStyle; |
| 1879 | 1898 |
instance.isHighLight = s.isHighLight; |
| 1880 | 1899 |
instance.ArrowText = s.ArrowText; |
내보내기 Unified diff
