mirror of
https://github.com/AppleWin/AppleWin.git
synced 2025-01-15 02:30:11 +00:00
Added new logo, fixed fullscreen y offset
This commit is contained in:
parent
00f9d8f1b9
commit
8809caefe2
@ -462,6 +462,7 @@
|
||||
<ClInclude Include="resource\winres.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="resource\ApplewinLogo.bmp" />
|
||||
<None Include="source\CPU\cpu_general.inl" />
|
||||
<None Include="source\CPU\cpu_instructions.inl" />
|
||||
<None Include="docs\CodingConventions.txt" />
|
||||
|
@ -73,7 +73,7 @@ CHARSET8M BITMAP "CHARSET8C.BMP"
|
||||
CHARSET8C BITMAP "CHARSET8C.BMP"
|
||||
HELP_BUTTON BITMAP "HELP.BMP"
|
||||
DRIVESWAP_BUTTON BITMAP "DRIVESWAP.BMP"
|
||||
IDB_APPLEWIN BITMAP "Applewin.bmp"
|
||||
IDB_APPLEWIN BITMAP "ApplewinLogo.bmp"
|
||||
IDB_DEBUG_FONT_7X8 BITMAP "Debug_Font.bmp"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
BIN
resource/ApplewinLogo.bmp
Normal file
BIN
resource/ApplewinLogo.bmp
Normal file
Binary file not shown.
After Width: | Height: | Size: 630 KiB |
@ -333,7 +333,8 @@ void VideoInitialize ()
|
||||
ZeroMemory(vidlastmem,0x10000);
|
||||
|
||||
// LOAD THE LOGO
|
||||
g_hLogoBitmap = (HBITMAP)LoadImage(g_hInstance, MAKEINTRESOURCE(IDB_APPLEWIN), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
|
||||
// g_hLogoBitmap = (HBITMAP)LoadImage(g_hInstance, MAKEINTRESOURCE(IDB_APPLEWIN), IMAGE_BITMAP, 560, 384, LR_CREATEDIBSECTION);
|
||||
g_hLogoBitmap = LoadBitmap( g_hInstance, MAKEINTRESOURCE(IDB_APPLEWIN) );
|
||||
|
||||
// CREATE A BITMAPINFO STRUCTURE FOR THE FRAME BUFFER
|
||||
g_pFramebufferinfo = (LPBITMAPINFO)VirtualAlloc(
|
||||
@ -975,9 +976,9 @@ void VideoDisplayLogo ()
|
||||
HDC hFrameDC = FrameGetDC();
|
||||
|
||||
// DRAW THE LOGO
|
||||
HBRUSH brush = CreateSolidBrush(PALETTERGB(0x70,0x30,0xE0));
|
||||
|
||||
SelectObject(hFrameDC, brush);
|
||||
// HBRUSH brush = CreateSolidBrush(PALETTERGB(0x70,0x30,0xE0));
|
||||
// SelectObject(hFrameDC, brush);
|
||||
|
||||
SelectObject(hFrameDC, GetStockObject(NULL_PEN));
|
||||
|
||||
int nViewportCX, nViewportCY;
|
||||
@ -1000,6 +1001,11 @@ void VideoDisplayLogo ()
|
||||
if (nViewportCY > bm.bmHeight)
|
||||
yoff = (nViewportCY - (scale * bm.bmHeight)) / 2;
|
||||
|
||||
if( g_bIsFullScreen )
|
||||
{
|
||||
yoff = 0;
|
||||
}
|
||||
|
||||
VideoDrawLogoBitmap( hFrameDC, xoff, yoff, bm.bmWidth, bm.bmHeight, scale );
|
||||
}
|
||||
}
|
||||
@ -1078,7 +1084,7 @@ void VideoDisplayLogo ()
|
||||
#undef DRAWVERSION
|
||||
|
||||
FrameReleaseDC();
|
||||
DeleteObject(brush);
|
||||
// DeleteObject(brush);
|
||||
DeleteObject(font);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user