From 2f9529a2cf699563a6d55ee4c05393ff4e250b47 Mon Sep 17 00:00:00 2001 From: oddMLan Date: Thu, 18 Apr 2019 22:34:27 -0700 Subject: [PATCH] [Cheats] Improved UI layout --- .../Project64/UserInterface/CheatClassUI.cpp | 14 ++--- Source/Project64/UserInterface/UIResources.rc | 58 +++++++++---------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/Source/Project64/UserInterface/CheatClassUI.cpp b/Source/Project64/UserInterface/CheatClassUI.cpp index b7196fba6..269146d48 100644 --- a/Source/Project64/UserInterface/CheatClassUI.cpp +++ b/Source/Project64/UserInterface/CheatClassUI.cpp @@ -188,7 +188,6 @@ int CALLBACK CCheatsUI::CheatAddProc(HWND hDlg, uint32_t uMsg, uint32_t wParam, CCheatsUI * _this = (CCheatsUI *)lParam; SetProp(hDlg, "Class", _this); - SetWindowTextW(hDlg, wGS(CHEAT_ADDCHEAT_FRAME).c_str()); SetWindowTextW(GetDlgItem(hDlg, IDC_NAME), wGS(CHEAT_ADDCHEAT_NAME).c_str()); SetWindowTextW(GetDlgItem(hDlg, IDC_CODE), wGS(CHEAT_ADDCHEAT_CODE).c_str()); SetWindowTextW(GetDlgItem(hDlg, IDC_LABEL_OPTIONS), wGS(CHEAT_ADDCHEAT_OPT).c_str()); @@ -452,18 +451,17 @@ int CALLBACK CCheatsUI::CheatListProc(HWND hDlg, uint32_t uMsg, uint32_t wParam, RECT rcList; RECT rcButton; - SetWindowTextW(GetDlgItem(hDlg, IDC_CHEATSFRAME), wGS(CHEAT_LIST_FRAME).c_str()); SetWindowTextW(GetDlgItem(hDlg, IDC_NOTESFRAME), wGS(CHEAT_NOTES_FRAME).c_str()); SetWindowTextW(GetDlgItem(hDlg, IDC_UNMARK), wGS(CHEAT_MARK_NONE).c_str()); - GetWindowRect(GetDlgItem(hDlg, IDC_CHEATSFRAME), &rcList); + GetWindowRect(hDlg, &rcList); GetWindowRect(GetDlgItem(hDlg, IDC_UNMARK), &rcButton); _this->m_hCheatTree = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, "", WS_CHILD | WS_VISIBLE | WS_VSCROLL | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_TABSTOP | - TVS_FULLROWSELECT, 8, 15, rcList.right - rcList.left - 16, - rcButton.top - rcList.top - 22, hDlg, (HMENU)IDC_MYTREE, GetModuleHandle(NULL), NULL); + TVS_FULLROWSELECT, 6, 4, rcList.right - rcList.left - 13, + rcButton.top - rcList.top - 8, hDlg, (HMENU)IDC_MYTREE, GetModuleHandle(NULL), NULL); Style = GetWindowLong(_this->m_hCheatTree, GWL_STYLE); SetWindowLong(_this->m_hCheatTree, GWL_STYLE, TVS_CHECKBOXES | TVS_SHOWSELALWAYS | Style); @@ -944,7 +942,7 @@ int CALLBACK CCheatsUI::ManageCheatsProc(HWND hDlg, uint32_t uMsg, uint32_t wPar if (g_Settings->LoadDword(UserInterface_BasicMode)) { RECT * rcList = (RECT *)_this->m_rcList; - GetWindowRect(GetDlgItem(_this->m_hSelectCheat, IDC_CHEATSFRAME), rcList); + GetWindowRect(_this->m_hSelectCheat, rcList); _this->m_MinSizeDlg = rcList->right - rcList->left + 16; _this->m_MaxSizeDlg = _this->m_MinSizeDlg; @@ -961,8 +959,8 @@ int CALLBACK CCheatsUI::ManageCheatsProc(HWND hDlg, uint32_t uMsg, uint32_t wPar ShowWindow(_this->m_AddCheat, SW_HIDE); RECT * rcAdd = (RECT *)_this->m_rcAdd, *rcList = (RECT *)_this->m_rcList; - GetWindowRect(GetDlgItem(_this->m_hSelectCheat, IDC_CHEATSFRAME), rcList); - GetWindowRect(GetDlgItem(_this->m_AddCheat, IDC_ADDCHEATSFRAME), rcAdd); + GetWindowRect(_this->m_hSelectCheat, rcList); + GetWindowRect(_this->m_AddCheat, rcAdd); _this->m_MinSizeDlg = rcList->right - rcList->left + 32; _this->m_MaxSizeDlg = rcAdd->right - rcList->left + 32; diff --git a/Source/Project64/UserInterface/UIResources.rc b/Source/Project64/UserInterface/UIResources.rc index 7f83932b1..98a1ee64e 100644 --- a/Source/Project64/UserInterface/UIResources.rc +++ b/Source/Project64/UserInterface/UIResources.rc @@ -176,27 +176,27 @@ BEGIN DEFPUSHBUTTON "&Close",IDC_CLOSE_BUTTON,169,186,64,14 GROUPBOX "",IDC_STATIC,6,5,228,177 LTEXT "ROM Name:",IDC_ROM_NAME,11,16,64,10 - EDITTEXT IDC_INFO_ROMNAME,77,15,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_ROMNAME,77,15,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "File Name:",IDC_FILE_NAME,11,31,64,10 - EDITTEXT IDC_INFO_FILENAME,77,30,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_FILENAME,77,30,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "Rom Size:",IDC_ROM_SIZE,11,74,64,10 - EDITTEXT IDC_INFO_ROMSIZE,77,74,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_ROMSIZE,77,74,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "Cartridge ID:",IDC_CART_ID,11,90,64,10 - EDITTEXT IDC_INFO_CARTID,77,89,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_CARTID,77,89,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "Manufacturer:",IDC_MANUFACTURER,11,106,64,10 - EDITTEXT IDC_INFO_MANUFACTURER,77,104,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_MANUFACTURER,77,104,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "Country:",IDC_COUNTRY,11,122,64,10 - EDITTEXT IDC_INFO_COUNTRY,77,119,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_COUNTRY,77,119,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "CRC1:",IDC_CRC1,11,135,64,10 - EDITTEXT IDC_INFO_CRC1,77,134,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_CRC1,77,134,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "CRC2:",IDC_CRC2,11,151,64,10 - EDITTEXT IDC_INFO_CRC2,77,149,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_CRC2,77,149,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "CIC Chip:",IDC_CIC_CHIP,11,167,64,10 - EDITTEXT IDC_INFO_CIC,77,164,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_CIC,77,164,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "Location:",IDC_LOCATION,11,45,64,10 - EDITTEXT IDC_INFO_LOCATION,77,45,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_LOCATION,77,45,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "MD5:",IDC_ROM_MD5,11,60,64,10 - EDITTEXT IDC_INFO_MD5,77,59,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_EX_STATICEDGE + EDITTEXT IDC_INFO_MD5,77,59,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP END IDD_Settings_GameGeneral DIALOGEX 0, 0, 218, 169 @@ -264,7 +264,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | CAPTION "Cheats" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - PUSHBUTTON "Button1",IDC_STATE,195,5,20,20,BS_ICON | WS_EX_TRANSPARENT + PUSHBUTTON "Button1",IDC_STATE,195,5,20,20,BS_LEFTTEXT | BS_ICON END IDD_Cheats_List DIALOGEX 0, 0, 201, 221 @@ -272,9 +272,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Cheats",IDC_CHEATSFRAME,0,0,199,160 - PUSHBUTTON "Unmark All",IDC_UNMARK,145,145,49,11 - GROUPBOX " Notes: ",IDC_NOTESFRAME,0,165,199,51 + PUSHBUTTON "Unmark All",IDC_UNMARK,148,152,49,11 + GROUPBOX " Notes: ",IDC_NOTESFRAME,3,165,194,48 EDITTEXT IDC_NOTES,5,175,188,36,ES_MULTILINE | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER | WS_VSCROLL END @@ -283,19 +282,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "",IDC_ADDCHEATSFRAME,2,0,188,145 - LTEXT "Name:",IDC_NAME,7,13,25,10 - EDITTEXT IDC_CODE_NAME,37,12,146,12,ES_AUTOHSCROLL - LTEXT "Code:",IDC_CODE,7,30,25,10 - LTEXT "
",IDC_CODE_DES,7,40,60,10 - LTEXT "Options:",IDC_LABEL_OPTIONS,82,30,30,10,WS_DISABLED - LTEXT "