#include "win32_loop.hpp"
#include "../src/theme.hpp"
#include "../src/window_manager.hpp"
+#include "../src/generic_window.hpp"
#include "../commands/cmd_dialogs.hpp"
#include "../commands/cmd_minimize.hpp"
}
// Initialize the resource path
- m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_homedir +
- "\\" + CONFIG_DIR + "\\skins" );
- m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
- "\\skins" );
- m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
- "\\skins2" );
- m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
- "\\share\\skins" );
- m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
- "\\share\\skins2" );
+ char *datadir = config_GetUserDir( VLC_DATA_DIR );
+ m_resourcePath.push_back( (string)datadir + "\\skins" );
+ free( datadir );
+ datadir = config_GetDataDir( getIntf() );
+ m_resourcePath.push_back( (string)datadir + "\\skins" );
+ m_resourcePath.push_back( (string)datadir + "\\skins2" );
+ m_resourcePath.push_back( (string)datadir + "\\share\\skins" );
+ m_resourcePath.push_back( (string)datadir + "\\share\\skins2" );
+ free( datadir );
// All went well
return true;
OSWindow *Win32Factory::createOSWindow( GenericWindow &rWindow, bool dragDrop,
- bool playOnDrop, OSWindow *pParent )
+ bool playOnDrop, OSWindow *pParent,
+ GenericWindow::WindowType_t type )
{
return new Win32Window( getIntf(), rWindow, m_hInst, m_hParentWindow,
dragDrop, playOnDrop, (Win32Window*)pParent );
}
-Rect Win32Factory::getWorkArea() const
+SkinsRect Win32Factory::getWorkArea() const
{
RECT r;
SystemParametersInfo( SPI_GETWORKAREA, 0, &r, 0 );
// Fill a Rect object
- Rect rect( r.left, r.top, r.right, r.bottom );
- return rect;
+ return SkinsRect( r.left, r.top, r.right, r.bottom );
}
LPCTSTR id;
switch( type )
{
- case kDefaultArrow:
- id = IDC_ARROW;
- break;
- case kResizeNWSE:
- id = IDC_SIZENWSE;
- break;
- case kResizeNS:
- id = IDC_SIZENS;
- break;
- case kResizeWE:
- id = IDC_SIZEWE;
- break;
- case kResizeNESW:
- id = IDC_SIZENESW;
- break;
- default:
- id = IDC_ARROW;
- break;
+ default:
+ case kDefaultArrow: id = IDC_ARROW; break;
+ case kResizeNWSE: id = IDC_SIZENWSE; break;
+ case kResizeNS: id = IDC_SIZENS; break;
+ case kResizeWE: id = IDC_SIZEWE; break;
+ case kResizeNESW: id = IDC_SIZENESW; break;
}
HCURSOR hCurs = LoadCursor( NULL, id );