From daf222e4e7107b386e3ecbb460b585908aaea40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20H=C3=A4user?= <8659494+mhaeuser@users.noreply.github.com> Date: Sun, 7 Mar 2021 19:32:47 +0100 Subject: [PATCH] OpenCanopy: Assume view is at (0, 0) --- Platform/OpenCanopy/Views/BootPicker.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Platform/OpenCanopy/Views/BootPicker.c b/Platform/OpenCanopy/Views/BootPicker.c index 0cc6cbf2..c1887343 100644 --- a/Platform/OpenCanopy/Views/BootPicker.c +++ b/Platform/OpenCanopy/Views/BootPicker.c @@ -160,16 +160,14 @@ InternalBootPickerViewDraw ( ASSERT (DrawContext != NULL); ASSERT (Context != NULL); - ASSERT (BaseX + OffsetX >= 0); - ASSERT (BaseY + OffsetY >= 0); - ASSERT (BaseX + OffsetX <= MAX_UINT32); - ASSERT (BaseY + OffsetY <= MAX_UINT32); + ASSERT (BaseX == 0); + ASSERT (BaseY == 0); GuiDrawToBufferFill ( &mBackgroundImage, DrawContext, - (UINT32) (BaseX + OffsetX), - (UINT32) (BaseY + OffsetY), + OffsetX, + OffsetY, Width, Height ); @@ -179,8 +177,8 @@ InternalBootPickerViewDraw ( &DrawContext->GuiContext->Background, 0xFF, DrawContext, - BaseX, - BaseY, + 0, + 0, mBackgroundImageOffsetX, mBackgroundImageOffsetY, OffsetX, @@ -194,8 +192,8 @@ InternalBootPickerViewDraw ( This, DrawContext, Context, - BaseX, - BaseY, + 0, + 0, OffsetX, OffsetY, Width, @@ -217,6 +215,8 @@ InternalBootPickerViewKeyEvent ( ASSERT (This != NULL); ASSERT (DrawContext != NULL); + ASSERT (BaseX == 0); + ASSERT (BaseY == 0); // // Consider moving between multiple panes with UP/DOWN and store the current // view within the object - for now, hardcoding this is enough. @@ -226,8 +226,8 @@ InternalBootPickerViewKeyEvent ( &mBootPicker.Hdr.Obj, DrawContext, Context, - BaseX + mBootPickerContainer.Obj.OffsetX + mBootPicker.Hdr.Obj.OffsetX, - BaseY + mBootPickerContainer.Obj.OffsetY + mBootPicker.Hdr.Obj.OffsetY, + mBootPickerContainer.Obj.OffsetX + mBootPicker.Hdr.Obj.OffsetX, + mBootPickerContainer.Obj.OffsetY + mBootPicker.Hdr.Obj.OffsetY, Key, Modifier );