ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added 5x and 6x window sizes to Win MFC builds (requires testing) 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@905 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
squall-leonhart 2009-09-11 04:33:34 +00:00
parent a7c7f04f8d
commit d960030dd5
8 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/win32/Commands.cpp
View File

@ -92,6 +92,8 @@ struct {
{ "OptionsVideoX2", ID_OPTIONS_VIDEO_X2 },
{ "OptionsVideoX3", ID_OPTIONS_VIDEO_X3 },
{ "OptionsVideoX4", ID_OPTIONS_VIDEO_X4 },
{ "OptionsVideoX5", ID_OPTIONS_VIDEO_X5 },
{ "OptionsVideoX6", ID_OPTIONS_VIDEO_X6 },
{ "OptionsVideo320x240", ID_OPTIONS_VIDEO_FULLSCREEN320X240 },
{ "OptionsVideo640x480", ID_OPTIONS_VIDEO_FULLSCREEN640X480 },
{ "OptionsVideo800x600", ID_OPTIONS_VIDEO_FULLSCREEN800X600 },

2
src/win32/MainWnd.cpp
View File

@ -127,6 +127,8 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_X2, OnUpdateOptionsVideoX2)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_X3, OnUpdateOptionsVideoX3)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_X4, OnUpdateOptionsVideoX4)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_X5, OnUpdateOptionsVideoX5)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_X6, OnUpdateOptionsVideoX6)
ON_COMMAND(ID_OPTIONS_VIDEO_FULLSCREEN, OnOptionsVideoFullscreen)
ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_FULLSCREEN, OnUpdateOptionsVideoFullscreen)
ON_WM_MOVING()

10
src/win32/MainWndOptions.cpp
View File

@ -271,6 +271,16 @@ void MainWnd::OnUpdateOptionsVideoX4(CCmdUI* pCmdUI)
pCmdUI->SetCheck(theApp.videoOption == VIDEO_4X);
}
void MainWnd::OnUpdateOptionsVideoX5(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck(theApp.videoOption == VIDEO_5X);
}
void MainWnd::OnUpdateOptionsVideoX6(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck(theApp.videoOption == VIDEO_6X);
}
BOOL MainWnd::OnOptionVideoSize(UINT nID)
{
theApp.updateVideoSize(nID);

8
src/win32/OpenGL.cpp
View File

@ -228,6 +228,14 @@ bool OpenGLDisplay::initialize()
theApp.surfaceSizeX = theApp.sizeX * 4;
theApp.surfaceSizeY = theApp.sizeY * 4;
break;
case VIDEO_5X:
theApp.surfaceSizeX = theApp.sizeX * 5;
theApp.surfaceSizeY = theApp.sizeY * 5;
break;
case VIDEO_6X:
theApp.surfaceSizeX = theApp.sizeX * 6;
theApp.surfaceSizeY = theApp.sizeY * 6;
break;
case VIDEO_320x240:
case VIDEO_640x480:
case VIDEO_800x600:

22
src/win32/VBA.cpp
View File

@ -1662,6 +1662,12 @@ void VBA::updateVideoSize(UINT id)
case ID_OPTIONS_VIDEO_X4:
value = VIDEO_4X;
break;
case ID_OPTIONS_VIDEO_X5:
value = VIDEO_5X;
break;
case ID_OPTIONS_VIDEO_X6:
value = VIDEO_6X;
break;
case ID_OPTIONS_VIDEO_FULLSCREEN320X240:
value = VIDEO_320x240;
fsWidth = 320;
@ -1801,6 +1807,14 @@ void VBA::updateWindowSize(int value)
surfaceSizeX = sizeX * 4;
surfaceSizeY = sizeY * 4;
break;
case VIDEO_5X:
surfaceSizeX = sizeX * 5;
surfaceSizeY = sizeY * 5;
break;
case VIDEO_6X:
surfaceSizeX = sizeX * 6;
surfaceSizeY = sizeY * 6;
break;
case VIDEO_320x240:
case VIDEO_640x480:
case VIDEO_800x600:
@ -1928,6 +1942,14 @@ bool VBA::preInitialize()
surfaceSizeX = sizeX * 4;
surfaceSizeY = sizeY * 4;
break;
case VIDEO_5X:
surfaceSizeX = sizeX * 5;
surfaceSizeY = sizeY * 5;
break;
case VIDEO_6X:
surfaceSizeX = sizeX * 6;
surfaceSizeY = sizeY * 6;
break;
case VIDEO_320x240:
case VIDEO_640x480:
case VIDEO_800x600:

2
src/win32/VBA.h
View File

@ -19,7 +19,7 @@
//
enum VIDEO_SIZE{
VIDEO_1X, VIDEO_2X, VIDEO_3X, VIDEO_4X,
VIDEO_1X, VIDEO_2X, VIDEO_3X, VIDEO_4X, VIDEO_5X, VIDEO_6X,
VIDEO_320x240, VIDEO_640x480, VIDEO_800x600, VIDEO_1024x768, VIDEO_1280x1024,
VIDEO_OTHER
};

2
src/win32/VBA.rc
View File

@ -1705,6 +1705,8 @@ BEGIN
MENUITEM "2x window size", ID_OPTIONS_VIDEO_X2
MENUITEM "3x window size", ID_OPTIONS_VIDEO_X3
MENUITEM "4x window size", ID_OPTIONS_VIDEO_X4
MENUITEM "5x window size", ID_OPTIONS_VIDEO_X5
MENUITEM "6x window size", ID_OPTIONS_VIDEO_X6
MENUITEM SEPARATOR
MENUITEM "Select fullscreen mode...", ID_OPTIONS_VIDEO_FULLSCREEN
MENUITEM SEPARATOR

4
src/win32/resource.h
View File

@ -585,6 +585,8 @@
#define ID_OPTIONS_VIDEO_X2 40011
#define ID_OPTIONS_VIDEO_X3 40012
#define ID_OPTIONS_VIDEO_X4 40013
#define ID_OPTIONS_VIDEO_X5 40373
#define ID_OPTIONS_VIDEO_X6 40374
#define ID_FILE_PAUSE 40014
#define ID_OPTIONS_EMULATOR_DIRECTORIES 40015
#define ID_OPTIONS_JOYPAD 40016
@ -877,7 +879,7 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 165
#define _APS_NEXT_COMMAND_VALUE 40373
#define _APS_NEXT_COMMAND_VALUE 40375
#define _APS_NEXT_CONTROL_VALUE 1297
#define _APS_NEXT_SYMED_VALUE 103
#endif