Commit 7528fa24 authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/wxwindows/wxwindows.cpp: don't use the saved positions/sizes...

* modules/gui/wxwindows/wxwindows.cpp: don't use the saved positions/sizes when acting as a dialog provider.
parent c57f42c1
...@@ -179,9 +179,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -179,9 +179,6 @@ static int Open( vlc_object_t *p_this )
/* We support play on start */ /* We support play on start */
p_intf->b_play = VLC_TRUE; p_intf->b_play = VLC_TRUE;
/* Load saved window settings */
p_intf->p_sys->p_window_settings = new WindowSettings( p_intf );
p_intf->p_sys->b_video_autosize = p_intf->p_sys->b_video_autosize =
config_GetInt( p_intf, "wxwin-autosize" ); config_GetInt( p_intf, "wxwin-autosize" );
...@@ -326,6 +323,9 @@ bool Instance::OnInit() ...@@ -326,6 +323,9 @@ bool Instance::OnInit()
* keep the default '.' for floating point numbers. */ * keep the default '.' for floating point numbers. */
setlocale( LC_NUMERIC, "C" ); setlocale( LC_NUMERIC, "C" );
/* Load saved window settings */
p_intf->p_sys->p_window_settings = new WindowSettings( p_intf );
/* Make an instance of your derived frame. Passing NULL (the default value /* Make an instance of your derived frame. Passing NULL (the default value
* of Frame's constructor is NULL) as the frame doesn't have a parent * of Frame's constructor is NULL) as the frame doesn't have a parent
* since it is the first window */ * since it is the first window */
...@@ -432,10 +432,11 @@ WindowSettings::WindowSettings( intf_thread_t *_p_intf ) ...@@ -432,10 +432,11 @@ WindowSettings::WindowSettings( intf_thread_t *_p_intf )
} }
b_shown[ID_MAIN] = true; b_shown[ID_MAIN] = true;
if( p_intf->pf_show_dialog ) return;
/* Parse the configuration */ /* Parse the configuration */
psz_org = psz = config_GetPsz( p_intf, "wxwin-config-last" ); psz_org = psz = config_GetPsz( p_intf, "wxwin-config-last" );
if( !psz || *psz == '\0' ) if( !psz || *psz == '\0' ) return;
return;
msg_Dbg( p_intf, "Using last windows config '%s'", psz ); msg_Dbg( p_intf, "Using last windows config '%s'", psz );
...@@ -525,12 +526,13 @@ invalid: ...@@ -525,12 +526,13 @@ invalid:
WindowSettings::~WindowSettings( ) WindowSettings::~WindowSettings( )
{ {
wxString sCfg; wxString sCfg;
int i;
if( p_intf->pf_show_dialog ) return;
sCfg = wxString::Format( wxT("(%d,0,0,%d,%d)"), ID_SCREEN, sCfg = wxString::Format( wxT("(%d,0,0,%d,%d)"), ID_SCREEN,
wxSystemSettings::GetMetric( wxSYS_SCREEN_X ), wxSystemSettings::GetMetric( wxSYS_SCREEN_X ),
wxSystemSettings::GetMetric( wxSYS_SCREEN_Y ) ); wxSystemSettings::GetMetric( wxSYS_SCREEN_Y ) );
for( i = 0; i < ID_MAX; i++ ) for( int i = 0; i < ID_MAX; i++ )
{ {
if( !b_valid[i] || !b_shown[i] ) if( !b_valid[i] || !b_shown[i] )
continue; continue;
...@@ -592,4 +594,3 @@ bool WindowSettings::GetSettings( int id, bool& _b_shown, wxPoint& p, wxSize& s) ...@@ -592,4 +594,3 @@ bool WindowSettings::GetSettings( int id, bool& _b_shown, wxPoint& p, wxSize& s)
return true; return true;
} }
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