clear menu option right before rewriting it, not earlier

when it was cleared earlier, mpd status tracer could refresh window
while ncmpcpp was waiting for new string and empty line was visible.
This commit is contained in:
Andrzej Rybczak
2009-11-13 19:38:47 +01:00
parent fdb9bfcd4f
commit 07099d4dc0
2 changed files with 4 additions and 4 deletions

View File

@@ -107,7 +107,7 @@ std::basic_string<my_char_t> SearchEngine::Title()
void SearchEngine::EnterPressed() void SearchEngine::EnterPressed()
{ {
size_t option = w->Choice(); size_t option = w->Choice();
if (option < SearchButton) if (option > 10 && option < SearchButton)
w->Current().first->Clear(); w->Current().first->Clear();
if (option < 15) if (option < 15)
LockStatusbar(); LockStatusbar();
@@ -116,6 +116,7 @@ void SearchEngine::EnterPressed()
{ {
Statusbar() << fmtBold << ConstraintsNames[option] << fmtBoldEnd << ' '; Statusbar() << fmtBold << ConstraintsNames[option] << fmtBoldEnd << ' ';
itsConstraints[option] = wFooter->GetString(itsConstraints[option]); itsConstraints[option] = wFooter->GetString(itsConstraints[option]);
w->Current().first->Clear();
*w->Current().first << fmtBold << std::setw(10) << std::left << ConstraintsNames[option] << fmtBoldEnd << ' '; *w->Current().first << fmtBold << std::setw(10) << std::left << ConstraintsNames[option] << fmtBoldEnd << ' ';
ShowTag(*w->Current().first, itsConstraints[option]); ShowTag(*w->Current().first, itsConstraints[option]);
} }

View File

@@ -98,15 +98,13 @@ void TinyTagEditor::EnterPressed()
size_t option = w->Choice(); size_t option = w->Choice();
MPD::Song &s = itsEdited; MPD::Song &s = itsEdited;
if (option < 20) // separator after filename
w->at(option).Clear();
LockStatusbar(); LockStatusbar();
if (option < 17) // separator after comment if (option < 17) // separator after comment
{ {
size_t pos = option-8; size_t pos = option-8;
Statusbar() << fmtBold << Info::Tags[pos].Name << ": " << fmtBoldEnd; Statusbar() << fmtBold << Info::Tags[pos].Name << ": " << fmtBoldEnd;
s.SetTags(Info::Tags[pos].Set, wFooter->GetString(s.GetTags(Info::Tags[pos].Get))); s.SetTags(Info::Tags[pos].Set, wFooter->GetString(s.GetTags(Info::Tags[pos].Get)));
w->at(option).Clear();
w->at(option) << fmtBold << Info::Tags[pos].Name << ':' << fmtBoldEnd << ' '; w->at(option) << fmtBold << Info::Tags[pos].Name << ':' << fmtBoldEnd << ' ';
ShowTag(w->at(option), s.GetTags(Info::Tags[pos].Get)); ShowTag(w->at(option), s.GetTags(Info::Tags[pos].Get));
} }
@@ -119,6 +117,7 @@ void TinyTagEditor::EnterPressed()
filename = filename.substr(0, dot); filename = filename.substr(0, dot);
std::string new_name = wFooter->GetString(filename); std::string new_name = wFooter->GetString(filename);
s.SetNewName(new_name + extension); s.SetNewName(new_name + extension);
w->at(option).Clear();
w->at(option) << fmtBold << "Filename:" << fmtBoldEnd << ' ' << (s.GetNewName().empty() ? s.GetName() : s.GetNewName()); w->at(option) << fmtBold << "Filename:" << fmtBoldEnd << ' ' << (s.GetNewName().empty() ? s.GetName() : s.GetNewName());
} }
UnlockStatusbar(); UnlockStatusbar();