jp9000/obs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use def window proc for bk erase, also spawn enable preview popup menu on WM_RBUTTONUP

Browse Source
This commit is contained in:
HomeWorld 2013-02-22 11:14:15 +02:00
parent 4ccbe1787d
commit 275690969d
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/WindowStuff.cpp
View File

@ -2545,13 +2545,7 @@ LRESULT CALLBACK OBS::RenderFrameProc(HWND hwnd, UINT message, WPARAM wParam, LP
if(App->bRenderViewEnabled && App->bRunning) if(App->bRenderViewEnabled && App->bRunning)
return 1L; return 1L;
else else
{ return DefWindowProc(hwnd, message, wParam, lParam);
RECT rc;
HDC hdc = (HDC) wParam;
GetClientRect(hwnd, &rc);
FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOWFRAME + 1));
return 1L;
}
} }
else if(message == WM_LBUTTONDOWN) else if(message == WM_LBUTTONDOWN)
{ {
@ -3100,7 +3094,7 @@ LRESULT CALLBACK OBS::RenderFrameProc(HWND hwnd, UINT message, WPARAM wParam, LP
} }
} }
} }
else if(message == WM_RBUTTONDOWN) else if(message == WM_RBUTTONUP)
{ {
HMENU hPopup = CreatePopupMenu(); HMENU hPopup = CreatePopupMenu();
AppendMenu(hPopup, MF_STRING | (App->bRenderViewEnabled ? MF_CHECKED : 0), ID_TOGGLERENDERVIEW, Str("RenderView.EnableView")); AppendMenu(hPopup, MF_STRING | (App->bRenderViewEnabled ? MF_CHECKED : 0), ID_TOGGLERENDERVIEW, Str("RenderView.EnableView"));
@ -3113,8 +3107,7 @@ LRESULT CALLBACK OBS::RenderFrameProc(HWND hwnd, UINT message, WPARAM wParam, LP
{ {
case ID_TOGGLERENDERVIEW: case ID_TOGGLERENDERVIEW:
App->bRenderViewEnabled = !App->bRenderViewEnabled; App->bRenderViewEnabled = !App->bRenderViewEnabled;
if(!App->bRenderViewEnabled) App->bForceRenderViewErase = !App->bRenderViewEnabled;
App->bForceRenderViewErase = true;
break; break;
} }