* modules/gui/wxwidgets: display and resizing of the embedded playlist should behave...

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index d63f87b7e6dec94f4e983472186873f2bf3d8205..adc9fd8ce0ae8fb3a6fd40cced05ae208647db10 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -117,22 +117,60 @@ class Splitter : public wxSplitterWindow
 public:
     Splitter( wxWindow *p_parent, intf_thread_t *_p_intf )
       : wxSplitterWindow( p_parent, -1, wxDefaultPosition, wxSize(0,0),
-                          wxCLIP_CHILDREN|wxSP_3DSASH ),
-        p_intf(_p_intf), i_sash_position(150) {}
+                          wxCLIP_CHILDREN | wxSP_3DSASH ),
+        p_intf(_p_intf), i_sash_position(150), i_width(-1)
+    {
+        SetSashSize( 0 );
+    }
+
     virtual ~Splitter() {};
 
     virtual bool Split( wxWindow* window1, wxWindow* window2 )
     {
+        SetSashSize( -1 );
+
+        wxSize size = wxSize( i_width, i_sash_position - GetSashSize() );
+        if( window2->GetSizer() ) window2->GetSizer()->SetMinSize( size );
+
         return wxSplitterWindow::SplitHorizontally( window1, window2,
                                                     -i_sash_position );
     }
 
+    virtual bool Unsplit( wxWindow* window )
+    {
+        SetSashSize( 0 );
+        return wxSplitterWindow::Unsplit( window );
+    }
+
 private:
     DECLARE_EVENT_TABLE()
 
     void OnSize( wxSizeEvent &event )
     {
-        SetSashPosition( event.GetSize().GetHeight() - i_sash_position );
+        /* If we display video, then resize the video window */
+        if( GetWindow2() &&
+            p_intf->p_sys->p_video_window && p_intf->p_sys->p_video_sizer &&
+            p_intf->p_sys->p_video_sizer->GetMinSize() != wxSize(0,0) )
+        {
+            SetSashPosition( event.GetSize().GetHeight() - i_sash_position );
+        }
+        else if( GetWindow2() && GetWindow1() && GetWindow1()->GetSizer() )
+        {
+            wxSize size = GetWindow1()->GetSizer()->GetMinSize();
+
+            if( event.GetSize().GetHeight() - size.GetHeight() )
+            {
+                SetSashPosition( size.GetHeight() ? size.GetHeight() : 1 );
+                i_sash_position = event.GetSize().GetHeight() -
+                    size.GetHeight();
+                i_width = event.GetSize().GetWidth();
+
+                size = wxSize( i_width, i_sash_position - GetSashSize() );
+                if( GetWindow2()->GetSizer() )
+                    GetWindow2()->GetSizer()->SetMinSize( size );
+            }
+        }
+
         event.Skip();
     }
 
@@ -145,6 +183,7 @@ private:
 
     intf_thread_t *p_intf;
     int i_sash_position;
+    int i_width;
 };
 
 BEGIN_EVENT_TABLE(Splitter, wxSplitterWindow)
@@ -261,7 +300,6 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
     p_intf = _p_intf;
     b_extra = VLC_FALSE;
     extra_frame = 0;
-    b_playlist_manager = VLC_FALSE;
     playlist_manager = 0;
 
     /* Give our interface a nice little icon */
@@ -717,13 +755,6 @@ void Interface::SetIntfMinSize()
             ms.SetWidth( ext_min_size.GetWidth() );
     }
 
-    if( playlist_manager && playlist_manager->IsShown() )
-    {
-        ms.SetHeight( ms.GetHeight() + playlist_min_size.GetHeight() );
-        if( playlist_min_size.GetWidth() > ms.GetWidth() )
-            ms.SetWidth( playlist_min_size.GetWidth() );
-    }
-
     SetSizeHints( ms.GetWidth(), ms.GetHeight() );
 }
 
@@ -911,12 +942,9 @@ void Interface::OnSmallPlaylist( wxCommandEvent& WXUNUSED(event) )
     {
         /* Create the extra panel */
         playlist_manager = new PlaylistManager( p_intf, splitter );
-        playlist_min_size = playlist_manager->GetBestSize();
     }
 
-    b_playlist_manager = !b_playlist_manager;
-
-    if( b_playlist_manager ) splitter->Split( main_panel, playlist_manager );
+    if( !splitter->IsSplit() ) splitter->Split( main_panel, playlist_manager );
     else splitter->Unsplit( playlist_manager );
 
     SetIntfMinSize();

diff --git a/modules/gui/wxwidgets/interface.hpp b/modules/gui/wxwidgets/interface.hpp
index 64e877bde532278822c4fb2630eaaee5439b8f8e..6476041fc2abb56c95c665659c04305b09665188 100644 (file)
--- a/modules/gui/wxwidgets/interface.hpp
+++ b/modules/gui/wxwidgets/interface.hpp
@@ -169,12 +169,10 @@ namespace wxvlc
         wxPanel     *extra_frame;
 
         /* Playlist panel */
-        vlc_bool_t  b_playlist_manager;
         wxPanel     *playlist_manager;
 
         /* Utility dimensions */
         wxSize main_min_size;
-        wxSize playlist_min_size;
         wxSize ext_min_size;
     };
 

diff --git a/modules/gui/wxwidgets/playlist_manager.cpp b/modules/gui/wxwidgets/playlist_manager.cpp
index 816448c5c79ef06337ce13797b09a52d20b860dd..00802a55ee1c6255b552543f101ca302cf1e1f3b 100644 (file)
--- a/modules/gui/wxwidgets/playlist_manager.cpp
+++ b/modules/gui/wxwidgets/playlist_manager.cpp
@@ -123,7 +123,6 @@ PlaylistManager::PlaylistManager( intf_thread_t *_p_intf, wxWindow *p_parent ):
     sizer = new wxBoxSizer( wxHORIZONTAL );
     SetSizer( sizer );
     sizer->Add( treectrl, 1, wxEXPAND );
-    treectrl->SetSizeHints( 500, 150 );
     sizer->Layout();
     sizer->Fit( this );