Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-02-05 17:30:45 +00:00
Code Issues Projects Releases Wiki Activity

Added new logo, fixed fullscreen y offset

Browse Source
This commit is contained in:
michaelangel007 2015-01-06 01:45:38 -08:00
parent 00f9d8f1b9
commit 8809caefe2
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplewinExpress10.00.vcxproj
View File

@ -462,6 +462,7 @@
<ClInclude Include="resource\winres.h" /> <ClInclude Include="resource\winres.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="resource\ApplewinLogo.bmp" />
<None Include="source\CPU\cpu_general.inl" /> <None Include="source\CPU\cpu_general.inl" />
<None Include="source\CPU\cpu_instructions.inl" /> <None Include="source\CPU\cpu_instructions.inl" />
<None Include="docs\CodingConventions.txt" /> <None Include="docs\CodingConventions.txt" />

2
resource/Applewin.rc
View File

@ -73,7 +73,7 @@ CHARSET8M BITMAP "CHARSET8C.BMP"
CHARSET8C BITMAP "CHARSET8C.BMP" CHARSET8C BITMAP "CHARSET8C.BMP"
HELP_BUTTON BITMAP "HELP.BMP" HELP_BUTTON BITMAP "HELP.BMP"
DRIVESWAP_BUTTON BITMAP "DRIVESWAP.BMP" DRIVESWAP_BUTTON BITMAP "DRIVESWAP.BMP"
IDB_APPLEWIN BITMAP "Applewin.bmp" IDB_APPLEWIN BITMAP "ApplewinLogo.bmp"
IDB_DEBUG_FONT_7X8 BITMAP "Debug_Font.bmp" IDB_DEBUG_FONT_7X8 BITMAP "Debug_Font.bmp"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

BIN
resource/ApplewinLogo.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 630 KiB

14
source/Video.cpp
View File

@ -333,7 +333,8 @@ void VideoInitialize ()
ZeroMemory(vidlastmem,0x10000); ZeroMemory(vidlastmem,0x10000);
// LOAD THE LOGO // 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 // CREATE A BITMAPINFO STRUCTURE FOR THE FRAME BUFFER
g_pFramebufferinfo = (LPBITMAPINFO)VirtualAlloc( g_pFramebufferinfo = (LPBITMAPINFO)VirtualAlloc(
@ -975,9 +976,9 @@ void VideoDisplayLogo ()
HDC hFrameDC = FrameGetDC(); HDC hFrameDC = FrameGetDC();
// DRAW THE LOGO // DRAW THE LOGO
HBRUSH brush = CreateSolidBrush(PALETTERGB(0x70,0x30,0xE0)); // HBRUSH brush = CreateSolidBrush(PALETTERGB(0x70,0x30,0xE0));
// SelectObject(hFrameDC, brush);
SelectObject(hFrameDC, brush);
SelectObject(hFrameDC, GetStockObject(NULL_PEN)); SelectObject(hFrameDC, GetStockObject(NULL_PEN));
int nViewportCX, nViewportCY; int nViewportCX, nViewportCY;
@ -1000,6 +1001,11 @@ void VideoDisplayLogo ()
if (nViewportCY > bm.bmHeight) if (nViewportCY > bm.bmHeight)
yoff = (nViewportCY - (scale * bm.bmHeight)) / 2; yoff = (nViewportCY - (scale * bm.bmHeight)) / 2;
if( g_bIsFullScreen )
{
yoff = 0;
}
VideoDrawLogoBitmap( hFrameDC, xoff, yoff, bm.bmWidth, bm.bmHeight, scale ); VideoDrawLogoBitmap( hFrameDC, xoff, yoff, bm.bmWidth, bm.bmHeight, scale );
} }
} }
@ -1078,7 +1084,7 @@ void VideoDisplayLogo ()
#undef DRAWVERSION #undef DRAWVERSION
FrameReleaseDC(); FrameReleaseDC();
DeleteObject(brush); // DeleteObject(brush);
DeleteObject(font); DeleteObject(font);
} }