diff --git a/changelog.txt b/changelog.txt index a6bb2f8d..9c4ba829 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,4 @@ +21-may-2009 - adelikat - win32 - reverted fixedFontHeight to 13 instead of 14. Gave the option of adjusting the height by modifying RowHeightBorder in the .cfg file 21-may-2009 - adelikat - win32 - made fullscreen toggle (Alt+Enter) remappable 15-may-2009 - shinydoofy - sdl - added --subtitles 10-may-2009 - shinydoofy - sdl - fixed Four Score movie playback diff --git a/src/drivers/win/config.cpp b/src/drivers/win/config.cpp index 94eae55b..40180c29 100644 --- a/src/drivers/win/config.cpp +++ b/src/drivers/win/config.cpp @@ -76,6 +76,8 @@ extern int TasEdit_wndx, TasEdit_wndy; extern int MetaPosX,MetaPosY; extern int MLogPosX,MLogPosY; +extern int RowHeightBorder; + //Structure that contains configuration information static CFGSTRUCT fceuconfig[] = { @@ -244,6 +246,7 @@ static CFGSTRUCT fceuconfig[] = { AC(NTViewRefresh), AC(rightClickEnabled), AC(CurrentState), + AC(RowHeightBorder), //ACS(memwLastfile[2048]), ENDCFGSTRUCT }; diff --git a/src/drivers/win/debugger.h b/src/drivers/win/debugger.h index 6c8b9d90..9536135f 100644 --- a/src/drivers/win/debugger.h +++ b/src/drivers/win/debugger.h @@ -38,7 +38,7 @@ public: HFONT hFixedFont; static const int fixedFontWidth = 8; - static const int fixedFontHeight = 14; + static const int fixedFontHeight = 13; } *debugSystem; diff --git a/src/drivers/win/memview.cpp b/src/drivers/win/memview.cpp index b700c2b6..45860b60 100644 --- a/src/drivers/win/memview.cpp +++ b/src/drivers/win/memview.cpp @@ -59,6 +59,8 @@ using namespace std; string memviewhelp = "{06F7BBD5-399E-4CA0-8E4E-75BE0ACC525A}"; //Hex Editor Help Page +int RowHeightBorder = 0; //adelikat: This will determine the number of pixels between rows in the hex editor, to alter this, the user can change it in the .cfg file, changing one will revert to the way FCEUX2.1.0 did it + // This defines all of our right click popup menus struct { @@ -324,7 +326,7 @@ void UpdateMemoryView(int draw_all) { if (!hMemView) return; int MemFontWidth = debugSystem->fixedFontWidth; - int MemFontHeight = debugSystem->fixedFontHeight; + int MemFontHeight = debugSystem->fixedFontHeight + RowHeightBorder; int i, j; //LPVOID lpMsgBuf; @@ -763,7 +765,7 @@ int GetHexScreenCoordx(int offset){ } int GetHexScreenCoordy(int offset){ - return (offset/16)*debugSystem->fixedFontHeight; + return (offset/16)*(debugSystem->fixedFontHeight+RowHeightBorder); } //0000E0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 : ................ @@ -773,7 +775,7 @@ int GetHexScreenCoordy(int offset){ int GetAddyFromCoord(int x,int y) { int MemFontWidth = debugSystem->fixedFontWidth; - int MemFontHeight = debugSystem->fixedFontHeight; + int MemFontHeight = debugSystem->fixedFontHeight + RowHeightBorder; if(y < 0)y = 0; if(x < 8*MemFontWidth)x = 8*MemFontWidth+1; @@ -848,7 +850,7 @@ LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa int tempAddy; const int MemFontWidth = debugSystem->fixedFontWidth; - const int MemFontHeight = debugSystem->fixedFontHeight; + const int MemFontHeight = debugSystem->fixedFontHeight + RowHeightBorder; char c[2]; char str[100];