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

nametable viewer: add auto-resizing to accomodate smaller DPI, partial fix for bug #753

This commit is contained in:
rainwarrior 2016-09-22 21:17:42 +00:00
parent f7841a1c8b
commit 1d5c5b27c0
2 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
trunk/src/drivers/win/ntview.cpp
View File

@ -310,6 +310,65 @@ void DrawNameTable(int scanline, int ntnum, bool invalidateCache) {
//}
}
static BOOL CALLBACK EnsurePixelSizeEnumWindowsProc(HWND hwnd, LPARAM lParam)
{
const int shift = lParam;
HWND ntbox = GetDlgItem(hNTView, IDC_NTVIEW_TABLE_BOX);
if (hwnd != ntbox)
{
RECT rect;
GetWindowRect(hwnd, &rect);
ScreenToClient(hNTView,(LPPOINT)&rect);
ScreenToClient(hNTView,((LPPOINT)&rect)+1);
SetWindowPos(hwnd,0,rect.left,rect.top+shift,0,0,SWP_NOZORDER | SWP_NOSIZE);
}
return TRUE;
}
static void EnsurePixelSize()
{
// DPI varies, so the pixel size of the window may be too small to fit the viewer.
// This expands the window and moves its controls around if necessary.
if (!hNTView) return;
HWND ntbox = GetDlgItem(hNTView, IDC_NTVIEW_TABLE_BOX);
const int MARGIN_W = 12;
const int MARGIN_H = 22;
const int MIN_W = 512 + MARGIN_W;
const int MIN_H = 480 + MARGIN_H;
RECT rect;
GetWindowRect(ntbox,&rect);
int nt_w = rect.right - rect.left;
int nt_h = rect.bottom - rect.top;
int nt_w_add = (nt_w < MIN_W) ? (MIN_W - nt_w) : 0;
int nt_h_add = (nt_h < MIN_H) ? (MIN_H - nt_h) : 0;
if (nt_w_add == 0 && nt_h_add == 0) return;
// expand parent window
RECT wrect;
GetWindowRect(hNTView,&wrect);
int ww = (wrect.right - wrect.left) + nt_w_add;
int wh = (wrect.bottom - wrect.top) + nt_h_add;
SetWindowPos(hNTView,0,0,0,ww,wh,SWP_NOZORDER | SWP_NOMOVE);
// expand NT box
SetWindowPos(ntbox,0,0,0,nt_w + nt_w_add,nt_h + nt_h_add, SWP_NOZORDER | SWP_NOMOVE);
// expand children
if (nt_h_add > 0)
{
EnumChildWindows(hNTView, EnsurePixelSizeEnumWindowsProc, nt_h_add);
}
RedrawWindow(hNTView,0,0,RDW_ERASE | RDW_INVALIDATE);
}
void FCEUD_UpdateNTView(int scanline, bool drawall) {
if(!NTViewer) return;
if(scanline != -1 && scanline != NTViewScanline) return;
@ -590,6 +649,7 @@ void DoNTView()
}
if (hNTView)
{
EnsurePixelSize();
//SetWindowPos(hNTView,HWND_TOP,0,0,0,0,SWP_NOSIZE|SWP_NOMOVE|SWP_NOOWNERZORDER);
ShowWindow(hNTView, SW_SHOWNORMAL);
SetForegroundWindow(hNTView);

14
trunk/src/drivers/win/res.rc
View File

@ -7,7 +7,8 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@ -875,10 +876,10 @@ BEGIN
CONTROL "Horizontal",IDC_NTVIEW_MIRROR_HORIZONTAL,"Button",BS_AUTORADIOBUTTON,6,300,47,10
CONTROL "Vertical",IDC_NTVIEW_MIRROR_VERTICAL,"Button",BS_AUTORADIOBUTTON,6,311,39,10
CONTROL "Four Screen",IDC_NTVIEW_MIRROR_FOUR_SCREEN,"Button",BS_AUTORADIOBUTTON,6,322,55,10
CONTROL "Single Screen 0",IDC_NTVIEW_MIRROR_SS_TABLE_0,"Button",BS_AUTORADIOBUTTON,65,300,60,10
CONTROL "Single Screen 1",IDC_NTVIEW_MIRROR_SS_TABLE_1,"Button",BS_AUTORADIOBUTTON,65,311,60,10
CONTROL "Single Screen 2",IDC_NTVIEW_MIRROR_SS_TABLE_2,"Button",BS_AUTORADIOBUTTON,65,322,60,10
CONTROL "Single Screen 3",IDC_NTVIEW_MIRROR_SS_TABLE_3,"Button",BS_AUTORADIOBUTTON,65,333,60,10
CONTROL "Single Screen 0",IDC_NTVIEW_MIRROR_SS_TABLE_0,"Button",BS_AUTORADIOBUTTON,65,300,65,10
CONTROL "Single Screen 1",IDC_NTVIEW_MIRROR_SS_TABLE_1,"Button",BS_AUTORADIOBUTTON,65,311,65,10
CONTROL "Single Screen 2",IDC_NTVIEW_MIRROR_SS_TABLE_2,"Button",BS_AUTORADIOBUTTON,65,322,65,10
CONTROL "Single Screen 3",IDC_NTVIEW_MIRROR_SS_TABLE_3,"Button",BS_AUTORADIOBUTTON,65,333,65,10
GROUPBOX "Properties",-1,134,289,130,59
LTEXT "Tile ID:",IDC_NTVIEW_PROPERTIES_LINE_1,144,300,110,10
LTEXT "X / Y:",IDC_NTVIEW_PROPERTIES_LINE_2,144,311,110,10
@ -2597,7 +2598,8 @@ IDB_BRANCH_SPRITESHEET BITMAP "res\\branch_spritesheet.bmp"
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED