[vlc-commits] win32: improve the behavior of some toolbar objects (refs #14562)

[Daniel Amm]

npapi-vlc | branch: master | Daniel Amm <da2424 at outlook.com> | Fri May 15 17:00:34 2015 +0200| [4a769488526486cc273b6f7fa091182c2d1e7cf8] | committer: Jean-Baptiste Kempf

win32: improve the behavior of some toolbar objects (refs #14562)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=4a769488526486cc273b6f7fa091182c2d1e7cf8
---

 common/win32_fullscreen.cpp |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/win32_fullscreen.cpp b/common/win32_fullscreen.cpp
index 5d928ea..fad5c1d 100644
--- a/common/win32_fullscreen.cpp
+++ b/common/win32_fullscreen.cpp
@@ -201,7 +201,7 @@ LRESULT VLCControlsWnd::WindowProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
                              ControlWidth, ControlsHeight, hWnd(),
                              (HMENU)ID_FS_SWITCH_FS, 0, 0);
             SendMessage(hFSButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,
-                        (LPARAM)RC().hDeFullscreenBitmap);
+                        (LPARAM)RC().hFullscreenBitmap);
             HorizontalOffset+=ControlWidth+xControlsSpace;
 
             RECT rect;
@@ -398,6 +398,12 @@ void VLCControlsWnd::RegisterToVLCEvents()
 
     VP()->get_mp().eventManager().onStopped([this] {
         PostMessage(hPlayPauseButton, BM_SETIMAGE, (WPARAM) IMAGE_BITMAP, (LPARAM) RC().hPlayBitmap);
+        PostMessage(hVideoPosScroll, (UINT) PBM_SETPOS, (WPARAM)0, 0);
+    });
+
+    VP()->get_mp().eventManager().onEndReached([this] {
+        PostMessage(hPlayPauseButton, BM_SETIMAGE, (WPARAM) IMAGE_BITMAP, (LPARAM) RC().hPlayBitmap);
+        PostMessage(hVideoPosScroll, (UINT) PBM_SETPOS, (WPARAM)0, 0);
     });
 }
 
@@ -912,6 +918,7 @@ void VLCWindowsManager::OnKeyDownEvent(UINT uKeyMsg)
         case VK_ESCAPE:
         case 'F':
             EndFullScreen();
+            _HolderWnd->ControlWindow()->UpdateFullscreenButton( FALSE );
             break;
     }
 }