tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes two issues in HiiFontProtocol->StringToImage() implementation on how to show string with wrap flag. 

Signed-off-by: lgao4

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12064 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2011-08-01 06:40:17 +00:00
parent 1261fe23ca
commit fbf82a2cf2
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
View File

@ -1917,7 +1917,7 @@ HiiStringToImage (
// When EFI_HII_OUT_FLAG_CLEAN_X is set, it will not draw a character // When EFI_HII_OUT_FLAG_CLEAN_X is set, it will not draw a character
// if its right-most on pixel cannot fit. // if its right-most on pixel cannot fit.
// //
if (Index > 0) { if (Index > RowInfo[RowIndex].StartIndex) {
// //
// Don't draw the last char on this row. And, don't draw the second last char (AdvanceX - Width - OffsetX). // Don't draw the last char on this row. And, don't draw the second last char (AdvanceX - Width - OffsetX).
// //
@ -1929,10 +1929,11 @@ HiiStringToImage (
RowInfo[RowIndex].BaselineOffset = BaseLineOffset; RowInfo[RowIndex].BaselineOffset = BaseLineOffset;
} else { } else {
// //
// There is only one column and it can not be drawn so that return directly. // There is no enough column to draw any character, so set current line width to zero.
// And go to draw Next line if LineBreak is set.
// //
Status = EFI_SUCCESS; RowInfo[RowIndex].LineWidth = 0;
goto Exit; goto NextLine;
} }
} }
@ -1941,7 +1942,9 @@ HiiStringToImage (
// opportunity prior to a character whose right-most extent would exceed Width. // opportunity prior to a character whose right-most extent would exceed Width.
// Search the right-most line-break opportunity here. // Search the right-most line-break opportunity here.
// //
if ((Flags & EFI_HII_OUT_FLAG_WRAP) == EFI_HII_OUT_FLAG_WRAP && StringPtr[NextIndex] != 0 && !LineBreak) { if ((Flags & EFI_HII_OUT_FLAG_WRAP) == EFI_HII_OUT_FLAG_WRAP &&
(RowInfo[RowIndex].LineWidth + BltX > Image->Width || StringPtr[NextIndex] != 0) &&
!LineBreak) {
if ((Flags & EFI_HII_IGNORE_LINE_BREAK) == 0) { if ((Flags & EFI_HII_IGNORE_LINE_BREAK) == 0) {
LineWidth = RowInfo[RowIndex].LineWidth; LineWidth = RowInfo[RowIndex].LineWidth;
for (Index1 = RowInfo[RowIndex].EndIndex; Index1 >= RowInfo[RowIndex].StartIndex; Index1--) { for (Index1 = RowInfo[RowIndex].EndIndex; Index1 >= RowInfo[RowIndex].StartIndex; Index1--) {
@ -1986,8 +1989,26 @@ HiiStringToImage (
// behave as if EFI_HII_OUT_FLAG_CLEAN_X is set. // behave as if EFI_HII_OUT_FLAG_CLEAN_X is set.
// //
if (!LineBreak) { if (!LineBreak) {
Flags &= (~ (EFI_HII_OUT_FLAGS) EFI_HII_OUT_FLAG_WRAP); LineWidth = RowInfo[RowIndex].LineWidth;
Flags |= EFI_HII_OUT_FLAG_CLIP_CLEAN_X; Index1 = RowInfo[RowIndex].EndIndex;
if (LineWidth + BltX > Image->Width) {
if (Index1 > RowInfo[RowIndex].StartIndex) {
//
// Don't draw the last char on this row. And, don't draw the second last char (AdvanceX - Width - OffsetX).
//
LineWidth -= (UINTN) (Cell[Index1].Width + Cell[Index1].OffsetX);
LineWidth -= (UINTN) (Cell[Index1 - 1].AdvanceX - Cell[Index1 - 1].Width - Cell[Index1 - 1].OffsetX);
RowInfo[RowIndex].EndIndex = Index1 - 1;
RowInfo[RowIndex].LineWidth = LineWidth;
} else {
//
// There is no enough column to draw any character, so set current line width to zero.
// And go to draw Next line if LineBreak is set.
//
RowInfo[RowIndex].LineWidth = 0;
goto NextLine;
}
}
} }
} }
@ -2117,6 +2138,7 @@ HiiStringToImage (
} }
} }
NextLine:
// //
// Recalculate the start point of X/Y axis to draw multi-lines with the order of top-to-down // Recalculate the start point of X/Y axis to draw multi-lines with the order of top-to-down
// //