Skip to content

Commit

Permalink
Use a new image instead
Browse files Browse the repository at this point in the history
  • Loading branch information
@oioitff
oioitff committed Apr 18, 2013
1 parent 36a03f7 commit 4414238
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 29 deletions.
10 changes: 3 additions & 7 deletions Windows/WndMainWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ namespace MainWindow
{
// TODO: connect to keyboard device instead
if (image.IsNull())
LoadImageFromResource(&image, hInst, MAKEINTRESOURCE(IDB_IMAGE_PSP), "JPG");
LoadImageFromResource(&image, hInst, MAKEINTRESOURCE(IDB_IMAGE_PSP), "IMAGE");
int key_pad_size = (IDC_EDIT_KEYRIGHT - IDC_EDIT_KEY_TURBO + 1);
for (u32 i = 0; i <= IDC_EDIT_KEY_ANALOG_RIGHT - IDC_EDIT_KEY_TURBO; i++) {
HWND hEdit = GetDlgItem(hDlg, IDC_EDIT_KEY_TURBO + i);
Expand All @@ -923,7 +923,7 @@ namespace MainWindow
HDC hdc = BeginPaint(hDlg, &pst);
int width = image.GetWidth();
int height = image.GetHeight();
image.BitBlt(hdc, 0, 0, width, height, 0 , 100);
image.BitBlt(hdc, 0, 0, width, height, 0 , 0);
EndPaint(hDlg, &pst);
return TRUE;
}
Expand All @@ -942,12 +942,8 @@ namespace MainWindow
RECT rc = getRedrawRect(hEdit);
RECT clientrc;
GetClientRect(hEdit, &clientrc);
image.BitBlt(hdc, 0, 0, rc.right - rc.left, rc.bottom - rc.top, rc.left, rc.top + 100);
image.BitBlt(hdc, 0, 0, rc.right - rc.left, rc.bottom - rc.top, rc.left, rc.top);
char str[11];
clientrc.left += 1;
clientrc.right += 1;
clientrc.top += 1;
clientrc.bottom += 1;
GetWindowTextA(hEdit, str, 10);
DrawTextA(hdc, str, strlen(str), &clientrc, DT_CENTER|DT_SINGLELINE);
return (LRESULT)GetStockObject(NULL_BRUSH);
Expand Down
44 changes: 22 additions & 22 deletions Windows/ppsspp.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,32 +94,32 @@ BEGIN
CONTROL "",IDC_TABDATATYPE,"SysTabControl32",TCS_BUTTONS,0,1,205,15
END

IDD_CONTROLS DIALOGEX 0, 0, 443, 234
IDD_CONTROLS DIALOGEX 0, 0, 495, 235
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Controls"
FONT 9, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,176,217,50,14
PUSHBUTTON "Cancel",IDCANCEL,230,217,50,14
LTEXT "Xbox 360 controllers are supported! Just plug one in and use it!",IDC_STATIC,14,6,201,8
LTEXT "Turbo Mode:",IDC_STATIC,339,203,42,8
EDITTEXT IDC_EDIT_KEYUP,52,73,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEYLEFT,30,91,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEYRIGHT,72,91,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEYDOWN,52,112,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_TRIANGLE,362,67,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_RECTANGLE,339,91,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_CIRCLE,386,91,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_CROSS,364,114,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_LEFT_THUMB,49,26,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_RIGHT_THUMB,361,25,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_SELECT,289,161,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_START,323,161,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_ANALOG_UP,54,130,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_ANALOG_LEFT,38,145,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_ANALOG_RIGHT,71,145,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_ANALOG_DOWN,54,159,33,14,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_KEY_TURBO,382,200,33,14,ES_CENTER | ES_AUTOHSCROLL
LTEXT "Turbo Mode:",IDC_STATIC,386,213,42,8
EDITTEXT IDC_EDIT_KEYUP,57,77,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEYLEFT,35,97,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEYRIGHT,77,97,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEYDOWN,57,119,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_TRIANGLE,406,73,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_RECTANGLE,380,98,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_CIRCLE,433,98,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_CROSS,408,125,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_LEFT_THUMB,53,24,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_RIGHT_THUMB,406,24,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_SELECT,326,190,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_START,356,190,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_ANALOG_UP,58,144,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_ANALOG_LEFT,42,158,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_ANALOG_RIGHT,75,158,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_ANALOG_DOWN,58,172,33,14,ES_CENTER | ES_AUTOHSCROLL | NOT WS_BORDER
EDITTEXT IDC_EDIT_KEY_TURBO,430,210,33,14,ES_CENTER | ES_AUTOHSCROLL
END

/////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -173,7 +173,7 @@ BEGIN

IDD_CONTROLS, DIALOG
BEGIN
MOCKUP, 1, 100, 0, -100, ".\psp.jpg"
MOCKUP, 1, 100, 0, 0, ".\pspmode.png"
RIGHTMARGIN, 440
END
END
Expand Down Expand Up @@ -350,10 +350,10 @@ END

/////////////////////////////////////////////////////////////////////////////
//
// JPG
// IMAGE
//

IDB_IMAGE_PSP JPG "psp.jpg"
IDB_IMAGE_PSP IMAGE "pspmode.png"

/////////////////////////////////////////////////////////////////////////////
//
Expand Down
Binary file removed Windows/psp.jpg
View file
Binary file not shown.
Binary file added Windows/pspmode.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4414238

Please sign in to comment.