Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "proxy song list: remove highlight"

Browse Source 
Highlight is too good not to have.
This reverts commit 9cbcf61fac.
This commit is contained in:
Andrzej Rybczak
2015-01-17 11:57:21 +01:00
parent f09d403e27
commit 51136701bb
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/actions.cpp
View File

@@ -379,11 +379,11 @@ void ScrollUpArtist::run()
std::string artist = s->getArtist(); std::string artist = s->getArtist();
while (pos > 0) while (pos > 0)
{ {
myScreen->scroll(NC::Scroll::Up);
s = pl.getSong(--pos); s = pl.getSong(--pos);
if (!s || s->getArtist() != artist) if (!s || s->getArtist() != artist)
break; break;
} }
pl.highlight(pos);
} }
} }
@@ -404,11 +404,11 @@ void ScrollUpAlbum::run()
std::string album = s->getAlbum(); std::string album = s->getAlbum();
while (pos > 0) while (pos > 0)
{ {
myScreen->scroll(NC::Scroll::Up);
s = pl.getSong(--pos); s = pl.getSong(--pos);
if (!s || s->getAlbum() != album) if (!s || s->getAlbum() != album)
break; break;
} }
pl.highlight(pos);
} }
} }
@@ -429,11 +429,11 @@ void ScrollDownArtist::run()
std::string artist = s->getArtist(); std::string artist = s->getArtist();
while (pos < pl.size() - 1) while (pos < pl.size() - 1)
{ {
myScreen->scroll(NC::Scroll::Down);
s = pl.getSong(++pos); s = pl.getSong(++pos);
if (!s || s->getArtist() != artist) if (!s || s->getArtist() != artist)
break; break;
} }
pl.highlight(pos);
} }
} }
@@ -454,11 +454,11 @@ void ScrollDownAlbum::run()
std::string album = s->getAlbum(); std::string album = s->getAlbum();
while (pos < pl.size() - 1) while (pos < pl.size() - 1)
{ {
myScreen->scroll(NC::Scroll::Down);
s = pl.getSong(++pos); s = pl.getSong(++pos);
if (!s || s->getAlbum() != album) if (!s || s->getAlbum() != album)
break; break;
} }
pl.highlight(pos);
} }
} }

3
src/proxy_song_list.h
View File

@@ -43,6 +43,7 @@ class ProxySongList
virtual bool empty() = 0; virtual bool empty() = 0;
virtual size_t size() = 0; virtual size_t size() = 0;
virtual size_t choice() = 0; virtual size_t choice() = 0;
virtual void highlight(size_t pos) = 0;
virtual bool isSelected(size_t pos) = 0; virtual bool isSelected(size_t pos) = 0;
virtual void setSelected(size_t pos, bool selected) = 0; virtual void setSelected(size_t pos, bool selected) = 0;
@@ -64,6 +65,7 @@ class ProxySongList
virtual bool empty() { return m_menu.empty(); } virtual bool empty() { return m_menu.empty(); }
virtual size_t size() { return m_menu.size(); } virtual size_t size() { return m_menu.size(); }
virtual size_t choice() { return m_menu.choice(); } virtual size_t choice() { return m_menu.choice(); }
virtual void highlight(size_t pos) { m_menu.highlight(pos); }
virtual bool isSelected(size_t pos) { virtual bool isSelected(size_t pos) {
assert(pos < m_menu.size()); assert(pos < m_menu.size());
@@ -110,6 +112,7 @@ public:
bool empty() const { return m_impl->empty(); } bool empty() const { return m_impl->empty(); }
size_t size() const { return m_impl->size(); } size_t size() const { return m_impl->size(); }
size_t choice() const { return m_impl->choice(); } size_t choice() const { return m_impl->choice(); }
void highlight(size_t pos) const { m_impl->highlight(pos); }
bool isSelected(size_t pos) const { return m_impl->isSelected(pos); } bool isSelected(size_t pos) const { return m_impl->isSelected(pos); }
void setSelected(size_t pos, bool selected) const { m_impl->setSelected(pos, selected); } void setSelected(size_t pos, bool selected) const { m_impl->setSelected(pos, selected); }