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

* fixed MessageLog bug #537 

* taseditor-ru: updates

[[Split portion of a mixed commit.]]
This commit is contained in:
ansstuff 2012-08-26 19:50:44 +00:00
parent 10d40f6b98
commit b5aaafe409
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/win/log.cpp
View File

@ -97,10 +97,10 @@ BOOL CALLBACK LogCon(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
if (HIWORD(wParam) == BN_CLICKED)
{
if (LOWORD(wParam) == IDB_CLEAR_LOG)
if (LOWORD(wParam) == CLEAR_LOG)
{
ClearLog();
} else if (LOWORD(wParam) == IDB_CLOSE_LOG)
} else
{
DestroyWindow(hwndDlg);
// Clear the handle

12
src/drivers/win/res.rc
View File

@ -801,14 +801,14 @@ BEGIN
RTEXT "Filter:",65484,6,255,21,12,SS_CENTERIMAGE | NOT WS_GROUP
END
MESSAGELOG DIALOGEX 33, 38, 262, 233
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
MESSAGELOG DIALOGEX 33, 38, 197, 229
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Message Log"
FONT 9, "Terminal", 0, 0, 0x0
FONT 9, "MS Shell Dlg", 0, 0, 0x0
BEGIN
EDITTEXT LBL_LOG_TEXT,3,3,255,208,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
PUSHBUTTON "Clear",IDB_CLEAR_LOG,156,214,49,16
PUSHBUTTON "Close",IDB_CLOSE_LOG,209,214,49,16
EDITTEXT LBL_LOG_TEXT,1,1,194,208,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
PUSHBUTTON "Clear",CLEAR_LOG,94,211,47,14
PUSHBUTTON "Close",CLOSE_LOG,146,211,47,14
END
NETMOO DIALOGEX 44, 59, 365, 209

6
src/drivers/win/resource.h
View File

@ -6,8 +6,6 @@
#define BUTTON_CLOSE 1
#define BTN_CLOSE 1
#define IDB_CLOSE_LOG 1
#define IDB_CLOSE_LOG2 2
#define IDB_CLEAR_LOG 2
#define MENU_OPEN_FILE 100
#define EDIT_ROMS 100
#define LBL_LOG_TEXT 100
@ -1127,6 +1125,8 @@
#define ID_CONFIG_AUTO 40566
#define ID_CONFIG_ADJUSTLAG 40567
#define ID_CONFIG_PATTERNSKIPSLAG 40568
#define CLEAR_LOG 40569
#define CLOSE_LOG 40570
#define IDC_DEBUGGER_ICONTRAY 55535
#define MW_ValueLabel2 65423
#define MW_ValueLabel1 65426
@ -1136,7 +1136,7 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 289
#define _APS_NEXT_COMMAND_VALUE 40569
#define _APS_NEXT_COMMAND_VALUE 40571
#define _APS_NEXT_CONTROL_VALUE 1282
#define _APS_NEXT_SYMED_VALUE 101
#endif

2
src/drivers/win/taseditor/greenzone.cpp
View File

@ -14,7 +14,7 @@ Greenzone - Access zone
* also stores LagLog of current movie Input
* saves and loads the data from a project file. On error: truncates Greenzone to last successfully read savestate
* regularly checks if there's a savestate of current emulation state, if there's no such savestate in array then creates one and updates lag info for previous frame
* implements the working of "Auto-adjust Input due to lag" feature
* implements the working of "Auto-adjust Input according to lag" feature
* regularly runs gradual cleaning of the savestates array (for memory saving), deleting oldest savestates
* on demand: (when movie Input was changed) truncates the size of Greenzone, deleting savestates that became irrelevant because of new Input. After truncating it may also move Playback cursor (which must always reside within Greenzone) and may launch Playback seeking
* stores resources: save id, properties of gradual cleaning, timing of cleaning