개정판 666bb823
issue #000: textControl ArcLength Save안되는 현상 수정, Line 두께에 따라 Textbox 글씨가 안보이는 현상 수정중, 텍스트Control들 LineSize만큼 넓혔을 경우 회전시 두개의 박스가 따로 노는 현상으로 주석
Change-Id: I0b51d8d41c74ab458b611de2a41ce777d613705b
| MarkupToPDF/Controls/Text/TextControl.cs | ||
|---|---|---|
| 141 | 141 |
this.Base_TextBox.GotFocus += new RoutedEventHandler(Base_TextBox_GotFocus); |
| 142 | 142 |
this.Base_TextBox.LostFocus += new RoutedEventHandler(Base_TextBox_LostFocus); |
| 143 | 143 |
this.Base_TextBox.SelectionChanged += (sender, e) => MoveCustomCaret(); |
| 144 |
|
|
| 144 |
|
|
| 145 |
if (Base_TextPath != null) |
|
| 146 |
{
|
|
| 147 |
Base_TextPath.StrokeThickness = LineSize.Left; |
|
| 148 |
} |
|
| 149 |
|
|
| 150 |
//if (string.IsNullOrEmpty(this.Base_TextBox.Text)) |
|
| 151 |
//{
|
|
| 152 |
// Base_TextPath.StrokeThickness = 20; |
|
| 153 |
// LineSize = new Thickness(20, 20, 20, 20); |
|
| 154 |
// //if (Base_TextPath != null) |
|
| 155 |
// //{
|
|
| 156 |
// // Base_TextPath.StrokeThickness = LineSize.Left; |
|
| 157 |
// //} |
|
| 158 |
//} |
|
| 159 |
//else |
|
| 160 |
//{
|
|
| 161 |
// Base_TextPath.StrokeThickness = LineSize.Left; |
|
| 162 |
//} |
|
| 163 |
|
|
| 145 | 164 |
SetText(); |
| 146 | 165 |
DrawingCloud(); |
| 147 | 166 |
} |
| ... | ... | |
| 287 | 306 |
|
| 288 | 307 |
|
| 289 | 308 |
} |
| 309 |
|
|
| 310 |
|
|
| 290 | 311 |
public void SetText() |
| 291 | 312 |
{
|
| 292 | 313 |
if (IsHighLight) |
| ... | ... | |
| 307 | 328 |
this.BackColor = new SolidColorBrush(Color.FromArgb(Convert.ToByte(255 * 0.1), |
| 308 | 329 |
Colors.White.R, Colors.White.G, Colors.White.B)); |
| 309 | 330 |
} |
| 310 |
if (Base_TextPath != null) |
|
| 311 |
{
|
|
| 312 |
Base_TextPath.StrokeThickness = LineSize.Left; |
|
| 313 |
} |
|
| 314 |
|
|
| 331 |
//if (Base_TextPath != null) |
|
| 332 |
//{
|
|
| 333 |
// Base_TextPath.StrokeThickness = LineSize.Left; |
|
| 334 |
//} |
|
| 315 | 335 |
} |
| 316 | 336 |
|
| 317 | 337 |
public void DrawingCloud() |
| ... | ... | |
| 323 | 343 |
new Point(BoxWidth + LineSize.Left * 0.5, BoxHeight + LineSize.Left * 0.5), |
| 324 | 344 |
new Point(BoxWidth + LineSize.Left * 0.5 ,-LineSize.Left * 0.5) |
| 325 | 345 |
}; |
| 346 |
if (this.ArcLength == 0) this.ArcLength = 10; |
|
| 326 | 347 |
//this.Base_TextBox.Select(Base_TextBox.Text.Length, 0); |
| 327 | 348 |
if (Base_TextPath != null) |
| 328 | 349 |
{
|
| ... | ... | |
| 342 | 363 |
break; |
| 343 | 364 |
case 2: |
| 344 | 365 |
{
|
| 366 |
List<Point> pCloud2 = new List<Point> |
|
| 367 |
{
|
|
| 368 |
new Point(-LineSize.Left* 2 , -LineSize.Left* 2 ), |
|
| 369 |
new Point(-LineSize.Left* 2 , BoxHeight + LineSize.Left * 2 ), |
|
| 370 |
new Point(BoxWidth + LineSize.Left* 2 , BoxHeight + LineSize.Left * 2 ), |
|
| 371 |
new Point(BoxWidth + LineSize.Left* 2 ,-LineSize.Left* 2 ) |
|
| 372 |
}; |
|
| 345 | 373 |
PathData = (Generate(pCloud, this.ArcLength, this.LineSize.Left)); |
| 346 | 374 |
PathDataInner = (GenerateInner(pCloud)); |
| 347 | 375 |
} |
| ... | ... | |
| 1263 | 1291 |
this.TextStyle.ToString(), |
| 1264 | 1292 |
this.TextWeight.ToString(), |
| 1265 | 1293 |
}; |
| 1266 |
|
|
| 1294 |
STemp.ArcLength = this.ArcLength; |
|
| 1267 | 1295 |
|
| 1268 | 1296 |
|
| 1269 | 1297 |
if (this.UnderLine != null) |
| ... | ... | |
| 1313 | 1341 |
//인구 추가(2018.04.17) |
| 1314 | 1342 |
TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
| 1315 | 1343 |
TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
| 1344 |
ArcLength = s.ArcLength |
|
| 1316 | 1345 |
}; |
| 1317 | 1346 |
|
| 1318 | 1347 |
if (s.fontConfig.Count() == 4) |
내보내기 Unified diff
