diff --git a/trunk/src/drivers/win/ntview.cpp b/trunk/src/drivers/win/ntview.cpp index a59a5185..6b580c52 100644 --- a/trunk/src/drivers/win/ntview.cpp +++ b/trunk/src/drivers/win/ntview.cpp @@ -138,11 +138,11 @@ void NTViewDoBlit(int autorefresh) { //draw vertical line MoveToEx(pDC,NTDESTX+xpos,NTDESTY,NULL); - LineTo(pDC,NTDESTX+xpos,NTDESTY+(NTHEIGHT*2)); + LineTo(pDC,NTDESTX+xpos,NTDESTY+(NTHEIGHT*2)-1); //draw horizontal line MoveToEx(pDC,NTDESTX,NTDESTY+ypos,NULL); - LineTo(pDC,NTDESTX+(NTWIDTH*2),NTDESTY+ypos); + LineTo(pDC,NTDESTX+(NTWIDTH*2)-1,NTDESTY+ypos); SetROP2(pDC,R2_COPYPEN); } diff --git a/trunk/src/drivers/win/res.rc b/trunk/src/drivers/win/res.rc index 69e2b46c..22f49101 100644 --- a/trunk/src/drivers/win/res.rc +++ b/trunk/src/drivers/win/res.rc @@ -856,33 +856,33 @@ BEGIN GROUPBOX "",112,3,18,185,50,WS_TABSTOP END -NTVIEW DIALOGEX 44, 38, 355, 365 +NTVIEW DIALOGEX 44, 38, 267, 350 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Name Table Viewer" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - GROUPBOX "Name Tables",IDC_NTVIEW_TABLE_BOX,0,0,267,255,WS_TABSTOP - LTEXT "Display on scanline:",65533, 7,268,65,10 - EDITTEXT IDC_NTVIEW_SCANLINE, 70,266,24,12 - CONTROL "Show Scroll Lines",IDC_NTVIEW_SHOW_SCROLL_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,101,263,69,10 - CONTROL "Show Attributes", IDC_NTVIEW_SHOW_ATTRIBUTES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,101,274,69,10 - CONTROL "Ignore Palettes", IDC_NTVIEW_HIDE_PALETTES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,101,285,69,10 - LTEXT "Refresh: More",-1,177,268,50,10 - CONTROL "",IDC_NTVIEW_REFRESH_TRACKBAR,"msctls_trackbar32",WS_TABSTOP,227,268,106,11 - LTEXT "Less",65534,333,268,18,10 - GROUPBOX "Current Mirroring",65532,7,298,214,63 - CONTROL "Horizontal", IDC_NTVIEW_MIRROR_HORIZONTAL, "Button",BS_AUTORADIOBUTTON,15,311,47,10 - CONTROL "Vertical", IDC_NTVIEW_MIRROR_VERTICAL, "Button",BS_AUTORADIOBUTTON,15,322,39,10 - CONTROL "Four Screen",IDC_NTVIEW_MIRROR_FOUR_SCREEN,"Button",BS_AUTORADIOBUTTON,15,333,55,10 - CONTROL "Single Screen (Table 0)",IDC_NTVIEW_MIRROR_SS_TABLE_0,"Button",BS_AUTORADIOBUTTON,113,311,90,10 - CONTROL "Single Screen (Table 1)",IDC_NTVIEW_MIRROR_SS_TABLE_1,"Button",BS_AUTORADIOBUTTON,113,322,90,10 - CONTROL "Single Screen (Table 2)",IDC_NTVIEW_MIRROR_SS_TABLE_2,"Button",BS_AUTORADIOBUTTON,113,333,90,10 - CONTROL "Single Screen (Table 3)",IDC_NTVIEW_MIRROR_SS_TABLE_3,"Button",BS_AUTORADIOBUTTON,113,344,90,10 - GROUPBOX "Properties",65531,227,298,122,63 - LTEXT "Tile ID:", IDC_NTVIEW_PROPERTIES_LINE_1,237,311,110,10 - LTEXT "X / Y:", IDC_NTVIEW_PROPERTIES_LINE_2,238,322,110,10 - LTEXT "PPU Address:",IDC_NTVIEW_PROPERTIES_LINE_3,237,333,110,10 - LTEXT "Attribute:", IDC_NTVIEW_PROPERTIES_LINE_4,237,344,110,10 + GROUPBOX "Name Tables",IDC_NTVIEW_TABLE_BOX,2,0,262,251,WS_TABSTOP + LTEXT "Refresh: More",-1,145,254,50,9 + CONTROL "",IDC_NTVIEW_REFRESH_TRACKBAR,"msctls_trackbar32",WS_TABSTOP,195,254,50,11 + LTEXT "Less",-1,245,254,18,10 + LTEXT "Display on scanline:",-1,173,269,65,9 + EDITTEXT IDC_NTVIEW_SCANLINE,235,267,27,12 + CONTROL "Show Scroll Lines",IDC_NTVIEW_SHOW_SCROLL_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,254,69,10 + CONTROL "Show Attributes", IDC_NTVIEW_SHOW_ATTRIBUTES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,265,69,10 + CONTROL "Ignore Palettes", IDC_NTVIEW_HIDE_PALETTES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,276,69,10 + GROUPBOX "Current Mirroring",-1,2,289,130,59 + 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 + 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 + LTEXT "PPU Address:",IDC_NTVIEW_PROPERTIES_LINE_3,144,322,110,10 + LTEXT "Attribute:", IDC_NTVIEW_PROPERTIES_LINE_4,144,333,110,10 END ROMPATCHER DIALOGEX 84, 67, 304, 135 @@ -1244,24 +1244,23 @@ BEGIN GROUPBOX "Logging workflow options",65528,8,142,171,52 END -PPUVIEW DIALOGEX 44, 38, 355, 260 +PPUVIEW DIALOGEX 44, 38, 268, 234 STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "PPU Viewer" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - GROUPBOX "Pattern Tables",GRP_PPUVIEW_TABLES,2,-1,351,205,WS_TABSTOP - LTEXT "Tile:",LBL_PPUVIEW_TILE1,6,170,50,9 - LTEXT "Tile:",LBL_PPUVIEW_TILE2,177,170,50,9 - CONTROL "",CTL_PPUVIEW_TRACKBAR,"msctls_trackbar32",WS_TABSTOP,227,179,106,11 - LTEXT "Refresh: More",-1,177,179,50,9 - LTEXT "Less",-1,334,179,18,10 - GROUPBOX "Palettes",LBL_PPUVIEW_PALETTES,2,204,351,54,WS_TABSTOP - LTEXT "Display on scanline:",-1,6,179,65,9 - EDITTEXT IDC_PPUVIEW_SCANLINE,72,177,27,12 - CONTROL "Mask unused graphics (needs Code/Data Logger)",IDC_MASK_UNUSED_GRAPHICS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,190,169,10 - CONTROL "Invert the mask",IDC_INVERT_THE_MASK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,190,61,10 - CONTROL "Sprites 8x16 mode",IDC_SPRITE16_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,279,190,75,10 + GROUPBOX "Pattern Tables",GRP_PPUVIEW_TABLES,2,-1,263,185,WS_TABSTOP + LTEXT "Tile:",LBL_PPUVIEW_TILE1, 6,138,50,9 + LTEXT "Tile:",LBL_PPUVIEW_TILE2,134,138,50,9 + LTEXT "Refresh: More",-1,145,151,50,9 + CONTROL "",CTL_PPUVIEW_TRACKBAR,"msctls_trackbar32",WS_TABSTOP,195,151,50,11 + LTEXT "Less",-1,245,151,18,10 + LTEXT "Display on scanline:",-1,173,166,65,9 + EDITTEXT IDC_PPUVIEW_SCANLINE,235,164,27,12 + CONTROL "Sprites 8x16 mode", IDC_SPRITE16_MODE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,151, 75,10 + CONTROL "Mask unused graphics (Code/Data Logger)",IDC_MASK_UNUSED_GRAPHICS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,162,140,10 + CONTROL "Invert the mask (Code/Data Logger)", IDC_INVERT_THE_MASK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,173,140,10 + GROUPBOX "Palettes",LBL_PPUVIEW_PALETTES,2,185,263,46,WS_TABSTOP END ARCHIVECHOOSERDIALOG DIALOGEX 0, 0, 265, 159