diff --git a/src/browser.cpp b/src/browser.cpp index 3812f865..527ce41f 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -67,7 +67,6 @@ void Browser::SwitchTo() CLEAR_FIND_HISTORY; w->Empty() ? myBrowser->GetDirectory(itsBrowsedDir) : myBrowser->UpdateItemList(); myScreen = this; - w->Hide(); redraw_header = 1; } @@ -368,8 +367,6 @@ void Browser::GetDirectory(string dir, string subdir) } if (highlightme >= 0) w->Highlight(highlightme); - if (myScreen == myBrowser) - w->Hide(); } void Browser::ChangeBrowseMode() diff --git a/src/clock.cpp b/src/clock.cpp index 143c9114..38f4477a 100644 --- a/src/clock.cpp +++ b/src/clock.cpp @@ -58,6 +58,8 @@ void Clock::Resize() w->MoveTo((COLS-Width)/2, (LINES-Height)/2); if (myScreen == this) { + if (myPlaylist->hasToBeResized) + myPlaylist->Resize(); myPlaylist->Main()->Hide(); w->Display(); } diff --git a/src/help.cpp b/src/help.cpp index e82c352a..cddab32c 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -52,7 +52,6 @@ void Help::SwitchTo() Resize(); myScreen = this; - w->Hide(); redraw_header = 1; } diff --git a/src/info.cpp b/src/info.cpp index 91d9530f..d79dd08d 100644 --- a/src/info.cpp +++ b/src/info.cpp @@ -103,7 +103,6 @@ void Info::GetSong() w->Clear(); PrepareSong(*s); w->Flush(); - w->Hide(); } } @@ -144,7 +143,6 @@ void Info::GetArtist() itsTitle = "Artist's info - " + *artist; w->Clear(); w->WriteXY(0, 0, 0, "Fetching artist's info..."); - w->Refresh(); if (!Downloader) { pthread_create(&Downloader, NULL, PrepareArtist, artist); diff --git a/src/lyrics.cpp b/src/lyrics.cpp index 34a1433b..4b5da927 100644 --- a/src/lyrics.cpp +++ b/src/lyrics.cpp @@ -120,9 +120,8 @@ void Lyrics::SwitchTo() myScreen = this; redraw_header = 1; w->Clear(); - w->WriteXY(0, 0, 0, "Fetching lyrics..."); - w->Refresh(); # ifdef HAVE_CURL_CURL_H + w->WriteXY(0, 0, 0, "Fetching lyrics..."); if (!Downloader) { pthread_create(&Downloader, NULL, Get, &itsSong); diff --git a/src/media_library.cpp b/src/media_library.cpp index fae3b20c..49245610 100644 --- a/src/media_library.cpp +++ b/src/media_library.cpp @@ -113,7 +113,6 @@ void MediaLibrary::SwitchTo() CLEAR_FIND_HISTORY; myScreen = this; - myPlaylist->Main()->Hide(); // hack, should be myScreen, but it doesn't always have 100% width redraw_header = 1; Refresh(); UpdateSongList(Songs); diff --git a/src/playlist.cpp b/src/playlist.cpp index 69ea7960..13e876e5 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -56,7 +56,6 @@ void Playlist::SwitchTo() CLEAR_FIND_HISTORY; myScreen = this; - w->Hide(); redraw_header = 1; } diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp index a097dcc5..0a695be5 100644 --- a/src/playlist_editor.cpp +++ b/src/playlist_editor.cpp @@ -98,7 +98,6 @@ void PlaylistEditor::SwitchTo() CLEAR_FIND_HISTORY; myScreen = this; - myPlaylist->Main()->Hide(); // hack, should be myScreen, but it doesn't always have 100% width redraw_header = 1; Refresh(); UpdateSongList(Content); diff --git a/src/scrollpad.cpp b/src/scrollpad.cpp index c0085b09..87fb3d9e 100644 --- a/src/scrollpad.cpp +++ b/src/scrollpad.cpp @@ -218,7 +218,7 @@ void Scrollpad::Clear(bool clrscr) SetColor(itsColor, itsBgColor); keypad(itsWindow, 1); if (clrscr) - Window::Clear(); + Refresh(); } Scrollpad &Scrollpad::operator<<(std::ostream &(*os)(std::ostream&)) diff --git a/src/search_engine.cpp b/src/search_engine.cpp index 401e3e7d..43a9fbb9 100644 --- a/src/search_engine.cpp +++ b/src/search_engine.cpp @@ -70,7 +70,6 @@ void SearchEngine::SwitchTo() if (w->Empty()) Prepare(); myScreen = this; - w->Hide(); redraw_header = 1; if (!w->Back().first) diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp index ba423550..608acf11 100644 --- a/src/tag_editor.cpp +++ b/src/tag_editor.cpp @@ -361,7 +361,6 @@ void TagEditor::SwitchTo() CLEAR_FIND_HISTORY; myScreen = this; - myPlaylist->Main()->Hide(); // hack, should be myScreen, but it doesn't always have 100% width redraw_header = 1; Refresh();