Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-09-21 02:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Draw2 renamed to DrawWithoutCompose. Improved.

Browse Source
This commit is contained in:
jief 2020-03-09 11:14:05 +03:00
parent efaf94491e
commit c355af81f4
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rEFIt_UEFI/libeg/XImage.cpp
View File

@ -394,7 +394,7 @@ void XImage::GetArea(INTN x, INTN y, UINTN W, UINTN H)
}
}
void XImage::Draw2(INTN x, INTN y, UINTN width, UINTN height, float scale)
void XImage::DrawWithoutCompose(INTN x, INTN y, UINTN width, UINTN height)
{
// //prepare images
//// DBG("1\n");
@ -406,8 +406,10 @@ void XImage::Draw2(INTN x, INTN y, UINTN width, UINTN height, float scale)
//// DBG("4\n");
// Background.Compose(0, 0, Top, true);
//// DBG("5\n");
UINTN AreaWidth = (x + Width > (UINTN)UGAWidth) ? (UGAWidth - x) : Width;
UINTN AreaHeight = (y + Height > (UINTN)UGAHeight) ? (UGAHeight - y) : Height;
if ( width == 0 ) width = Width;
if ( height == 0 ) height = Height;
UINTN AreaWidth = (x + width > (UINTN)UGAWidth) ? (UGAWidth - x) : width;
UINTN AreaHeight = (y + height > (UINTN)UGAHeight) ? (UGAHeight - y) : height;
// DBG("area=%d,%d\n", AreaWidth, AreaHeight);
// prepare protocols
EFI_STATUS Status;
@ -427,11 +429,11 @@ void XImage::Draw2(INTN x, INTN y, UINTN width, UINTN height, float scale)
if (GraphicsOutput != NULL) {
GraphicsOutput->Blt(GraphicsOutput, (*this).GetPixelPtr(0, 0),
EfiBltBufferToVideo,
0, 0, x, y, width, height, GetWidth()*sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL));
0, 0, x, y, AreaWidth, AreaHeight, GetWidth()*sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL));
}
else if (UgaDraw != NULL) {
UgaDraw->Blt(UgaDraw, (EFI_UGA_PIXEL *)(*this).GetPixelPtr(0, 0), EfiUgaBltBufferToVideo,
0, 0, x, y, AreaWidth, AreaHeight, 0);
0, 0, x, y, AreaWidth, AreaHeight, GetWidth()*sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL));
}
}

2
rEFIt_UEFI/libeg/XImage.h
View File

@ -89,7 +89,7 @@ public:
void GetArea(const EG_RECT& Rect);
void GetArea(INTN x, INTN y, UINTN W, UINTN H);
void Draw(INTN x, INTN y, float scale);
void Draw2(INTN x, INTN y, UINTN width, UINTN height, float scale);
void DrawWithoutCompose(INTN x, INTN y, UINTN width = 0, UINTN height = 0);
};
#endif //__XSTRINGW_H__

2
rEFIt_UEFI/libeg/XPointer.cpp
View File

@ -40,7 +40,7 @@ XPointer::~XPointer()
void XPointer::Hide()
{
if (Alive) {
oldImage.Draw2(oldPlace.XPos, oldPlace.YPos, oldImage.GetWidth(), oldImage.GetHeight(), 1.f);
oldImage.DrawWithoutCompose(oldPlace.XPos, oldPlace.YPos);
}
}