개정판 666bb823
issue #000: textControl ArcLength Save안되는 현상 수정, Line 두께에 따라 Textbox 글씨가 안보이는 현상 수정중, 텍스트Control들 LineSize만큼 넓혔을 경우 회전시 두개의 박스가 따로 노는 현상으로 주석
Change-Id: I0b51d8d41c74ab458b611de2a41ce777d613705b
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 673 | 673 |
{
|
| 674 | 674 |
double textControlWidth; |
| 675 | 675 |
double textControlHeight; |
| 676 |
|
|
| 676 |
//LineSize = ((dynamic)currentControl).LineSize.Left; |
|
| 677 | 677 |
if (((currentControl as TextControl).Base_TextBox.ActualWidth) == 0) |
| 678 | 678 |
{
|
| 679 | 679 |
textControlWidth = ((currentControl as TextControl).Base_TextBlock.ActualWidth); |
| ... | ... | |
| 755 | 755 |
} |
| 756 | 756 |
else |
| 757 | 757 |
{
|
| 758 |
if(item.DrawingData.GetType().Name == "TriControl") |
|
| 759 |
LineSize = ((MarkupToPDF.Controls.Shape.TriControl)currentControl).LineSize; |
|
| 760 |
else if(item.DrawingData.GetType().Name == "RectangleControl") |
|
| 761 |
LineSize = ((MarkupToPDF.Controls.Shape.RectangleControl)currentControl).LineSize; |
|
| 762 |
else if (item.DrawingData.GetType().Name == "RectCloudControl") |
|
| 763 |
LineSize = ((MarkupToPDF.Controls.Shape.RectCloudControl)currentControl).LineSize; |
|
| 764 |
else if (item.DrawingData.GetType().Name == "CloudControl") |
|
| 765 |
LineSize = ((MarkupToPDF.Controls.Polygon.CloudControl)currentControl).LineSize; |
|
| 766 |
else if (item.DrawingData.GetType().Name == "PolygonControl") |
|
| 767 |
LineSize = ((MarkupToPDF.Controls.Polygon.PolygonControl)currentControl).LineSize;
|
|
| 758 |
//if(item.DrawingData.GetType().Name == "TriControl")
|
|
| 759 |
// LineSize = ((MarkupToPDF.Controls.Shape.TriControl)currentControl).LineSize;
|
|
| 760 |
//else if(item.DrawingData.GetType().Name == "RectangleControl")
|
|
| 761 |
// LineSize = ((MarkupToPDF.Controls.Shape.RectangleControl)currentControl).LineSize;
|
|
| 762 |
//else if (item.DrawingData.GetType().Name == "RectCloudControl")
|
|
| 763 |
// LineSize = ((MarkupToPDF.Controls.Shape.RectCloudControl)currentControl).LineSize;
|
|
| 764 |
//else if (item.DrawingData.GetType().Name == "CloudControl")
|
|
| 765 |
// LineSize = ((MarkupToPDF.Controls.Polygon.CloudControl)currentControl).LineSize;
|
|
| 766 |
//else if (item.DrawingData.GetType().Name == "PolygonControl")
|
|
| 767 |
LineSize = ((dynamic)currentControl).LineSize;
|
|
| 768 | 768 |
|
| 769 | 769 |
if ((currentControl as IPath).PathData.Bounds.Left < minX) minX = (currentControl as IPath).PathData.Bounds.Left; |
| 770 | 770 |
if ((currentControl as IPath).PathData.Bounds.Top < minY) minY = (currentControl as IPath).PathData.Bounds.Top; |
| ... | ... | |
| 773 | 773 |
} |
| 774 | 774 |
} |
| 775 | 775 |
|
| 776 |
|
|
| 776 | 777 |
Rect ac = new Rect(minX, minY, maxX - minX, maxY - minY); |
| 777 | 778 |
bool addWidthSize = false; |
| 778 | 779 |
bool addHeightSize = false; |
내보내기 Unified diff
