개정판 e5bd2147
Undo push method 수정
font size 수정
Change-Id: Ib02186683c56b454c0a50bdb8dddb8165111d5e3
| MarkupToPDF/Controls/Text/TextControl.cs | ||
|---|---|---|
| 87 | 87 |
Base_Border = GetTemplateChild(PART_Border) as Border; |
| 88 | 88 |
Base_Canvas = GetTemplateChild(PART_Canvas) as Canvas; |
| 89 | 89 |
BaseTextbox_Caret = GetTemplateChild(PART_BaseTextbox_Caret) as Border; |
| 90 |
BaseTextbox_Caret.Height = this.Base_TextBox.FontSize; |
|
| 90 |
//BaseTextbox_Caret.Height = this.Base_TextBox.FontSize;
|
|
| 91 | 91 |
this.Base_TextBox.Text = this.Text; |
| 92 | 92 |
this.Base_TextBox.CaretIndex = this.Base_TextBox.Text.Length; |
| 93 | 93 |
this.Base_TextBox.CaretBrush = new SolidColorBrush(Colors.Transparent); |
| 94 | 94 |
this.Base_TextBox.ApplyTemplate(); |
| 95 | 95 |
MoveCustomCaret(); |
| 96 |
if(this.Base_TextBox.FontSize > this.BaseTextbox_Caret.Height) |
|
| 97 |
{
|
|
| 98 |
BaseTextbox_Caret.Height = this.Base_TextBox.FontSize; |
|
| 99 |
} |
|
| 100 |
//BaseTextbox_Caret.Height = Base_TextBox.ActualHeight - 5; |
|
| 96 | 101 |
|
| 97 | 102 |
this.Base_TextBox.SizeChanged += new SizeChangedEventHandler(Base_TextBox_SizeChanged); |
| 98 | 103 |
this.Base_TextBox.TextChanged += new TextChangedEventHandler(Base_TextBox_TextChanged); |
| ... | ... | |
| 134 | 139 |
} |
| 135 | 140 |
|
| 136 | 141 |
if (!double.IsInfinity(caretLocation.Y)) {
|
| 137 |
Canvas.SetTop(this.BaseTextbox_Caret, (LineSize.Top + caretLocation.Y)); |
|
| 142 |
Canvas.SetTop(this.BaseTextbox_Caret, caretLocation.Y); |
|
| 143 |
//Canvas.SetTop(this.BaseTextbox_Caret, (LineSize.Top - caretLocation.Y)); |
|
| 138 | 144 |
} |
| 139 | 145 |
} |
| 140 | 146 |
|
내보내기 Unified diff
