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

Merge pull request #1624 from oddMLan/ux-fixes 

Mem Viewer: Fix address text box size
This commit is contained in:
zilmar 2019-05-16 18:31:36 +09:30 committed by GitHub
parent 9d9fccf218 3b9cafc058
commit 395cad470d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Project64/UserInterface/UIResources.rc
View File

@ -516,19 +516,19 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS
CAPTION "Memory" CAPTION "Memory"
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
EDITTEXT IDC_ADDR_EDIT,35,5,47,12 EDITTEXT IDC_ADDR_EDIT,35,5,49,12,ES_AUTOHSCROLL
LTEXT "Address:",IDC_STATIC,4,6,29,11 LTEXT "Address:",IDC_STATIC,4,6,29,11
CONTROL "Is VAddr?",IDC_CHK_VADDR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,7,46,8 CONTROL "Is VAddr?",IDC_CHK_VADDR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,111,7,46,8
PUSHBUTTON "Dump",IDC_DUMP_MEM,319,4,54,13 PUSHBUTTON "Dump",IDC_DUMP_MEM,319,4,54,13
PUSHBUTTON "Search",IDC_SEARCH_MEM,377,4,54,13 PUSHBUTTON "Search",IDC_SEARCH_MEM,377,4,54,13
SCROLLBAR IDC_SCRL_BAR,421,23,11,154,SBS_VERT SCROLLBAR IDC_SCRL_BAR,421,23,11,154,SBS_VERT
PUSHBUTTON "Refresh",IDC_REFRSH_MEM,159,4,54,13 PUSHBUTTON "Refresh",IDC_REFRSH_MEM,161,4,54,13
CONTROL "Mem Details",IDC_MEM_DETAILS,"ListCtrl",WS_TABSTOP,4,23,416,154 CONTROL "Mem Details",IDC_MEM_DETAILS,"ListCtrl",WS_TABSTOP,4,23,416,154
PUSHBUTTON "...",IDC_SYMBOLS_BTN,84,4,21,13 PUSHBUTTON "...",IDC_SYMBOLS_BTN,86,4,21,13
LTEXT "",IDC_SYM_INFO,8,198,418,8 LTEXT "",IDC_SYM_INFO,8,198,418,8
LTEXT "",IDC_DMA_INFO,8,208,415,8 LTEXT "",IDC_DMA_INFO,8,208,415,8
GROUPBOX "",IDC_STATIC,4,190,428,30 GROUPBOX "",IDC_STATIC,4,190,428,30
CONTROL "Auto",IDC_CHK_AUTOREFRESH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,7,31,8 CONTROL "Auto",IDC_CHK_AUTOREFRESH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,220,7,31,8
END END
IDD_Debugger_Search DIALOGEX 0, 0, 357, 257 IDD_Debugger_Search DIALOGEX 0, 0, 357, 257

6
Source/Project64/UserInterface/WTLControls/EditNumber32.cpp
View File

@ -84,7 +84,7 @@ bool CEditNumber32::IsHexConvertableText(LPTSTR _text)
for (; i < strlen(_text); i++) for (; i < strlen(_text); i++)
{ {
char c = _text[i]; char c = _text[i];
if (!(c >= 48 && c <= 57 || c >= 'A'&&c <= 'F' || c >= 'a'&&c <= 'f')) if (!(c >= 48 && c <= 57 || c >= 'A'&&c <= 'F' || c >= 'a'&&c <= 'f' || c == ' '))
{ {
bPaste = false; bPaste = false;
break; break;
@ -115,6 +115,10 @@ void CEditNumber32::FormatClipboard()
{ {
lptstr[i] = 'x'; lptstr[i] = 'x';
} }
if (lptstr[i] == ' ' && (i < strlen(lptstr)))
{
strcpy(&lptstr[i], &lptstr[i + 1]);
}
} }
hglb = GlobalAlloc(GMEM_MOVEABLE, (strlen(lptstr) + 1) * sizeof(TCHAR)); hglb = GlobalAlloc(GMEM_MOVEABLE, (strlen(lptstr) + 1) * sizeof(TCHAR));
if (hglb == NULL) if (hglb == NULL)