개정판 7a5210f1
issue #1117: set DashSize of Rect control and add padding for text control in merged service
Change-Id: I6a358ca74216a5e23ba99cff5b73a38dd21bf626
| FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_DrawString.cs | ||
|---|---|---|
| 156 | 156 |
ct.Alignment = Element.ALIGN_MIDDLE | Element.ALIGN_CENTER; |
| 157 | 157 |
float fLeadingSize = (calRect.Height / (float)tokens.Length); |
| 158 | 158 |
float spacing = ((float)calRect.Height - tokens.Length*itextFont.CalculatedSize)/tokens.Length; |
| 159 |
/// add paddings |
|
| 160 |
calRect.Right += (float)(lineSize * 0.5); |
|
| 161 |
if (calRect.Top > calRect.Bottom) |
|
| 162 |
calRect.Top += (float)(lineSize * 0.5); |
|
| 163 |
else |
|
| 164 |
calRect.Bottom += (float)(lineSize * 0.5); |
|
| 165 |
/// up to here |
|
| 159 | 166 |
ct.SetLeading(itextFont.CalculatedSize + spacing, ct.MultipliedLeading); |
| 160 | 167 |
ct.SetSimpleColumn(calRect); |
| 161 | 168 |
ct.Go(); |
| ... | ... | |
| 274 | 281 |
ct.SetText(new Phrase(new Chunk(text, itextFont))); |
| 275 | 282 |
ct.Alignment = Element.ALIGN_MIDDLE | Element.ALIGN_CENTER; |
| 276 | 283 |
float spacing = ((float)calRect.Height - tokens.Length * itextFont.CalculatedSize) / tokens.Length; |
| 284 |
/// add paddings |
|
| 285 |
calRect.Right += (float)(lineSize * 0.5); |
|
| 286 |
if (calRect.Top > calRect.Bottom) |
|
| 287 |
calRect.Top += (float)(lineSize * 0.5); |
|
| 288 |
else |
|
| 289 |
calRect.Bottom += (float)(lineSize * 0.5); |
|
| 290 |
/// up to here |
|
| 277 | 291 |
ct.SetLeading(itextFont.CalculatedSize + spacing, ct.MultipliedLeading); |
| 278 | 292 |
ct.SetSimpleColumn(calRect); |
| 279 | 293 |
ct.Go(); |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1417 | 1417 |
if (control != null) |
| 1418 | 1418 |
{
|
| 1419 | 1419 |
control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift); |
| 1420 |
control.Paint = ViewerDataModel.Instance.paintSet; |
|
| 1421 | 1420 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 1422 | 1421 |
control.Paint = ViewerDataModel.Instance.paintSet; |
| 1423 | 1422 |
} |
| ... | ... | |
| 1468 | 1467 |
{
|
| 1469 | 1468 |
control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift); |
| 1470 | 1469 |
if(control.ControlType == ControlType.Mark) control.Paint = PaintSet.Fill; |
| 1470 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
|
| 1471 | 1471 |
} |
| 1472 | 1472 |
} |
| 1473 | 1473 |
break; |
내보내기 Unified diff
