Commit 970109d8 authored by Damien Fouilleul's avatar Damien Fouilleul

- wxwidgets: slider tweaks completed, needs testing

parent 263c385c
...@@ -58,7 +58,7 @@ END_EVENT_TABLE() ...@@ -58,7 +58,7 @@ END_EVENT_TABLE()
#define STATUS_PLAYING 1 #define STATUS_PLAYING 1
#define STATUS_PAUSE 2 #define STATUS_PAUSE 2
#if WIN32 #ifdef WIN32
#include <commctrl.h> #include <commctrl.h>
...@@ -84,16 +84,17 @@ static LRESULT CALLBACK MovieSliderWindowProc(HWND hWnd, UINT uMsg, WPARAM wPara ...@@ -84,16 +84,17 @@ static LRESULT CALLBACK MovieSliderWindowProc(HWND hWnd, UINT uMsg, WPARAM wPara
{ {
LONG min = SendMessage(hWnd, TBM_GETRANGEMIN, 0, 0); LONG min = SendMessage(hWnd, TBM_GETRANGEMIN, 0, 0);
LONG max = SendMessage(hWnd, TBM_GETRANGEMAX, 0, 0); LONG max = SendMessage(hWnd, TBM_GETRANGEMAX, 0, 0);
LONG thumb = SendMessage(hWnd, TBM_GETTHUMBLENGTH, 0, 0);; LONG thumb = tRect.right-tRect.left;
LONG newpos; LONG newpos;
SendMessage(hWnd, TBM_GETCHANNELRECT, 0, (LPARAM)&tRect); SendMessage(hWnd, TBM_GETCHANNELRECT, 0, (LPARAM)&tRect);
/* following is only valid for horizontal trackbar */ /* following is only valid for horizontal a trackbar */
newpos = ((click.x-tRect.left-(thumb/2))*(max-min)+((tRect.right-tRect.left-thumb)/2))/(tRect.right-tRect.left-thumb); newpos = ((click.x-tRect.left-(thumb/2))*(max-min)+((tRect.right-tRect.left-thumb)/2))
/(tRect.right-tRect.left-thumb);
/* set new postion */ /* set new postion */
SendMessage(hWnd, TBM_SETPOS, TRUE, newpos); SendMessage(hWnd, TBM_SETPOS, TRUE, min+newpos);
/* notify parent of change */ /* notify parent of change */
SendMessage(GetParent(hWnd), WM_HSCROLL, TB_ENDTRACK, (LPARAM)hWnd); SendMessage(GetParent(hWnd), WM_HSCROLL, TB_ENDTRACK, (LPARAM)hWnd);
...@@ -127,7 +128,7 @@ InputManager::InputManager( intf_thread_t *_p_intf, Interface *_p_main_intf, ...@@ -127,7 +128,7 @@ InputManager::InputManager( intf_thread_t *_p_intf, Interface *_p_main_intf,
/* Create slider */ /* Create slider */
slider = new wxSlider( this, SliderScroll_Event, 0, 0, SLIDER_MAX_POS ); slider = new wxSlider( this, SliderScroll_Event, 0, 0, SLIDER_MAX_POS );
#if WIN32 #ifdef WIN32
/* modify behaviour of WIN32 underlying control /* modify behaviour of WIN32 underlying control
in order to implement proper movie slider */ in order to implement proper movie slider */
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment