[vlc-commits] npapi win32, ActiveX: added VLC cone displaying when no video playing.
Sergey Radionov
git at videolan.org
Thu Jan 5 03:00:06 CET 2012
npapi-vlc | branch: master | Sergey Radionov <RSATom at gmail.com> | Mon Jan 2 23:34:28 2012 +0700| [c93a88b2835d7006132050cfe80e76653e909194] | committer: Sergey Radionov
npapi win32, ActiveX: added VLC cone displaying when no video playing.
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=c93a88b2835d7006132050cfe80e76653e909194
---
common/win32_fullscreen.cpp | 13 +++++++++++++
common/win32_fullscreen.h | 5 +++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/common/win32_fullscreen.cpp b/common/win32_fullscreen.cpp
index 3291666..8d6a911 100644
--- a/common/win32_fullscreen.cpp
+++ b/common/win32_fullscreen.cpp
@@ -120,6 +120,19 @@ LRESULT CALLBACK VLCHolderWnd::VLCHolderClassWndProc(HWND hWnd, UINT uMsg, WPARA
MoveWindow(hWnd, 0, 0,
(ParentClientRect.right-ParentClientRect.left),
(ParentClientRect.bottom-ParentClientRect.top), FALSE);
+
+ h_data->_hConeIcon = LoadIcon( h_data->_WindowsManager->getHModule(), MAKEINTRESOURCE(8) );
+ break;
+ }
+ case WM_PAINT:{
+ PAINTSTRUCT PaintStruct;
+ HDC hDC = BeginPaint(hWnd, &PaintStruct);
+ RECT rect;
+ GetClientRect(hWnd, &rect);
+ int IconX = ((rect.right - rect.left) - GetSystemMetrics(SM_CXICON))/2;
+ int IconY = ((rect.bottom - rect.top) - GetSystemMetrics(SM_CYICON))/2;
+ DrawIcon(hDC, IconX, IconY, h_data->_hConeIcon);
+ EndPaint(hWnd, &PaintStruct);
break;
}
case WM_NCDESTROY:
diff --git a/common/win32_fullscreen.h b/common/win32_fullscreen.h
index 2ceb58e..dd07ae1 100644
--- a/common/win32_fullscreen.h
+++ b/common/win32_fullscreen.h
@@ -61,14 +61,15 @@ private:
private:
VLCHolderWnd(HWND hWnd, VLCWindowsManager* WM)
- : _hMouseHook(NULL), _MouseHookThreadId(0), _hWnd(hWnd)
- , _WindowsManager(WM){};
+ : _hMouseHook(NULL), _MouseHookThreadId(0), _hWnd(hWnd),
+ _WindowsManager(WM), _hConeIcon(0){};
public:
HWND getHWND() const {return _hWnd;}
private:
HWND _hWnd;
+ HICON _hConeIcon;
VLCWindowsManager* _WindowsManager;
};
More information about the vlc-commits
mailing list