mirror of
https://github.com/CloverHackyColor/CloverBootloader.git
synced 2024-12-24 16:27:42 +01:00
testing mouse
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
parent
797b5638d6
commit
b5dc9e1b7f
@ -4282,7 +4282,8 @@ InitTheme(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Kill mouse before we invalidate builtin pointer image
|
// Kill mouse before we invalidate builtin pointer image
|
||||||
// KillMouse();
|
// KillMouse();
|
||||||
|
//here we have no access to Mouse
|
||||||
|
|
||||||
// Invalidate BuiltinIcons
|
// Invalidate BuiltinIcons
|
||||||
// DBG ("Invalidating BuiltinIcons...\n");
|
// DBG ("Invalidating BuiltinIcons...\n");
|
||||||
|
@ -41,7 +41,7 @@ XPointer::~XPointer()
|
|||||||
|
|
||||||
void XPointer::Hide()
|
void XPointer::Hide()
|
||||||
{
|
{
|
||||||
if (SimplePointerProtocol) {
|
if (Alive) {
|
||||||
oldImage.Draw(oldPlace.XPos, oldPlace.YPos, 1.f);
|
oldImage.Draw(oldPlace.XPos, oldPlace.YPos, 1.f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -94,6 +94,7 @@ EFI_STATUS XPointer::MouseBirth()
|
|||||||
oldPlace.YPos = (INTN)(UGAHeight >> 2);
|
oldPlace.YPos = (INTN)(UGAHeight >> 2);
|
||||||
oldPlace.Width = POINTER_WIDTH;
|
oldPlace.Width = POINTER_WIDTH;
|
||||||
oldPlace.Height = POINTER_HEIGHT;
|
oldPlace.Height = POINTER_HEIGHT;
|
||||||
|
DBG("init mouse at [%d, %d]\n", oldPlace.XPos, oldPlace.YPos);
|
||||||
CopyMem(&newPlace, &oldPlace, sizeof(EG_RECT));
|
CopyMem(&newPlace, &oldPlace, sizeof(EG_RECT));
|
||||||
|
|
||||||
//newImage->Fill(&MenuBackgroundPixel),
|
//newImage->Fill(&MenuBackgroundPixel),
|
||||||
|
@ -135,17 +135,18 @@ EG_IMAGE * BuiltinIcon(IN UINTN Id)
|
|||||||
EG_IMAGE *TextBuffer = NULL;
|
EG_IMAGE *TextBuffer = NULL;
|
||||||
CONST CHAR16 *p;
|
CONST CHAR16 *p;
|
||||||
CHAR16 *Text;
|
CHAR16 *Text;
|
||||||
|
// DBG("Take image for %d\n", Id);
|
||||||
if (Id >= BUILTIN_ICON_COUNT) {
|
if (Id >= BUILTIN_ICON_COUNT) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (BuiltinIconTable[Id].Image != NULL) {
|
if (BuiltinIconTable[Id].Image != NULL) {
|
||||||
|
// DBG(" ... the image present\n");
|
||||||
return BuiltinIconTable[Id].Image;
|
return BuiltinIconTable[Id].Image;
|
||||||
}
|
}
|
||||||
|
|
||||||
Size = BuiltinIconTable[Id].PixelSize;
|
Size = BuiltinIconTable[Id].PixelSize;
|
||||||
//DBG("Load Icon [id:%d]");
|
// DBG("Load Icon [id:%d]");
|
||||||
|
|
||||||
if (ThemeDir && !GlobalConfig.TypeSVG) {
|
if (ThemeDir && !GlobalConfig.TypeSVG) {
|
||||||
CHAR16 *Path;
|
CHAR16 *Path;
|
||||||
|
@ -1373,7 +1373,12 @@ VOID AboutRefit(VOID)
|
|||||||
AboutMenu.TitleImage = NULL;
|
AboutMenu.TitleImage = NULL;
|
||||||
}
|
}
|
||||||
if (AboutMenu.Entries.size() == 0) {
|
if (AboutMenu.Entries.size() == 0) {
|
||||||
AboutMenu.AddMenuInfo(PoolPrint(L"Clover Version 2.5k rev %s", gFirmwareRevision)); // by Slice, dmazar, apianti, JrCs, pene and others");
|
AboutMenu.AddMenuInfo(PoolPrint(L"Clover Version 5.0"));
|
||||||
|
#ifdef REVISION_STR
|
||||||
|
AboutMenu.AddMenuInfo(PoolPrint(L" %a", REVISION_STR));
|
||||||
|
#else
|
||||||
|
AboutMenu.AddMenuInfo(PoolPrint(L" Revision", gFirmwareRevision));
|
||||||
|
#endif
|
||||||
#ifdef FIRMWARE_BUILDDATE
|
#ifdef FIRMWARE_BUILDDATE
|
||||||
AboutMenu.AddMenuInfo(PoolPrint(L" Build: %a", FIRMWARE_BUILDDATE));
|
AboutMenu.AddMenuInfo(PoolPrint(L" Build: %a", FIRMWARE_BUILDDATE));
|
||||||
#else
|
#else
|
||||||
@ -2168,7 +2173,8 @@ VOID REFIT_MENU_SCREEN::HidePointer()
|
|||||||
|
|
||||||
EFI_STATUS REFIT_MENU_SCREEN::MouseBirth()
|
EFI_STATUS REFIT_MENU_SCREEN::MouseBirth()
|
||||||
{
|
{
|
||||||
if ( !mPointer ) return RETURN_INVALID_PARAMETER;
|
|
||||||
|
if ( !mPointer ) mPointer = new XPointer();
|
||||||
return mPointer->MouseBirth();
|
return mPointer->MouseBirth();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user