개정판 5ba8f2d5
issue #0000 상단 Text Option 변경시 finalPDF에서 적용 안 되는 묹제 수정
Change-Id: I953cbd54dda6c80c893168df8ef36eb03f770f5f
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 161 | 161 |
break; |
| 162 | 162 |
} |
| 163 | 163 |
} |
| 164 |
|
|
| 165 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 164 | 166 |
} |
| 165 | 167 |
|
| 166 | 168 |
} |
| ... | ... | |
| 523 | 525 |
|
| 524 | 526 |
try |
| 525 | 527 |
{
|
| 526 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0) |
|
| 528 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0 || ViewerDataModel.Instance.IsMarkupUpdate)
|
|
| 527 | 529 |
{
|
| 528 | 530 |
List<IKCOM.MarkupInfoItem> SelectedMarkupInfos = new List<IKCOM.MarkupInfoItem>(); |
| 529 | 531 |
foreach (var item in menu.gridViewMarkup.SelectedItems) |
| ... | ... | |
| 535 | 537 |
} |
| 536 | 538 |
|
| 537 | 539 |
result = await SaveCommand.Instance.Execute(SelectedMarkupInfos); |
| 540 |
ViewerDataModel.Instance.IsMarkupUpdate = false; |
|
| 538 | 541 |
} |
| 539 | 542 |
else |
| 540 | 543 |
{
|
| ... | ... | |
| 1107 | 1110 |
if((InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).TextWeight == FontWeights.Bold) |
| 1108 | 1111 |
{
|
| 1109 | 1112 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).TextWeight = FontWeights.Normal; |
| 1113 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1110 | 1114 |
} |
| 1111 | 1115 |
else |
| 1112 | 1116 |
{
|
| 1113 | 1117 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).TextWeight = FontWeights.Bold; |
| 1118 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1114 | 1119 |
} |
| 1115 | 1120 |
|
| 1116 | 1121 |
} |
| ... | ... | |
| 1120 | 1125 |
if ((InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).TextWeight == FontWeights.Bold) |
| 1121 | 1126 |
{
|
| 1122 | 1127 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).TextWeight = FontWeights.Normal; |
| 1128 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1123 | 1129 |
} |
| 1124 | 1130 |
else |
| 1125 | 1131 |
{
|
| 1126 | 1132 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).TextWeight = FontWeights.Bold; |
| 1133 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1127 | 1134 |
} |
| 1128 | 1135 |
} |
| 1129 | 1136 |
break; |
| ... | ... | |
| 1155 | 1162 |
if((InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).TextStyle == FontStyles.Italic) |
| 1156 | 1163 |
{
|
| 1157 | 1164 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).TextStyle = System.Windows.FontStyles.Normal; |
| 1165 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1158 | 1166 |
} |
| 1159 | 1167 |
else |
| 1160 | 1168 |
{
|
| 1161 | 1169 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).TextStyle = FontStyles.Italic; |
| 1170 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1162 | 1171 |
} |
| 1163 | 1172 |
|
| 1164 | 1173 |
} |
| ... | ... | |
| 1168 | 1177 |
if((InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).TextStyle == FontStyles.Italic) |
| 1169 | 1178 |
{
|
| 1170 | 1179 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).TextStyle = FontStyles.Normal; |
| 1180 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1171 | 1181 |
} |
| 1172 | 1182 |
else |
| 1173 | 1183 |
{
|
| 1174 | 1184 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).TextStyle = FontStyles.Italic; |
| 1185 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1175 | 1186 |
} |
| 1176 | 1187 |
} |
| 1177 | 1188 |
break; |
| ... | ... | |
| 1223 | 1234 |
} |
| 1224 | 1235 |
break; |
| 1225 | 1236 |
} |
| 1237 |
|
|
| 1238 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1226 | 1239 |
} |
| 1227 | 1240 |
} |
| 1228 | 1241 |
} |
| ... | ... | |
| 1285 | 1298 |
{
|
| 1286 | 1299 |
if (item is MarkupToPDF.Controls.Text.ArrowTextControl ctrl1) |
| 1287 | 1300 |
{
|
| 1301 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1288 | 1302 |
ctrl1.SetFontFamily(font.FontFamily); |
| 1289 | 1303 |
} |
| 1290 | 1304 |
else if (item is MarkupToPDF.Controls.Text.TextControl ctrl2) |
| 1291 | 1305 |
{
|
| 1306 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1292 | 1307 |
ctrl2.SetFontFamily(font.FontFamily); |
| 1293 | 1308 |
} |
| 1294 | 1309 |
} |
내보내기 Unified diff
