summaryrefslogtreecommitdiff
path: root/src/curses
diff options
context:
space:
mode:
authorAndrzej Rybczak <electricityispower@gmail.com>2017-01-06 13:58:22 +0100
committerAndrzej Rybczak <electricityispower@gmail.com>2017-01-06 13:58:22 +0100
commit7d502e42ba08f466a508fd25b67d7e31b1330720 (patch)
tree8502b66f4e399f864407967e41db8c025a0d100a /src/curses
parente1919599764b57dd1b1bbc3c16ef15604079ed8b (diff)
Check if songs are in playlist when displaying them, not up-front
Diffstat (limited to 'src/curses')
-rw-r--r--src/curses/menu.h19
-rw-r--r--src/curses/menu_impl.h4
2 files changed, 4 insertions, 19 deletions
diff --git a/src/curses/menu.h b/src/curses/menu.h
index b178c049..747acf52 100644
--- a/src/curses/menu.h
+++ b/src/curses/menu.h
@@ -41,24 +41,16 @@ struct List
{
enum Type {
None = 0,
- Bold = (1 << 0),
- Selectable = (1 << 1),
- Selected = (1 << 2),
- Inactive = (1 << 3),
- Separator = (1 << 4)
+ Selectable = (1 << 0),
+ Selected = (1 << 1),
+ Inactive = (1 << 2),
+ Separator = (1 << 3)
};
Properties(Type properties = Selectable)
: m_properties(properties)
{ }
- void setBold(bool is_bold)
- {
- if (is_bold)
- m_properties |= Bold;
- else
- m_properties &= ~Bold;
- }
void setSelectable(bool is_selectable)
{
if (is_selectable)
@@ -90,7 +82,6 @@ struct List
m_properties &= ~Separator;
}
- bool isBold() const { return m_properties & Bold; }
bool isSelectable() const { return m_properties & Selectable; }
bool isSelected() const { return m_properties & Selected; }
bool isInactive() const { return m_properties & Inactive; }
@@ -180,13 +171,11 @@ struct Menu: Window, List
const Properties &properties() const { return std::get<1>(*m_impl); }
// Forward methods to List::Properties.
- void setBold (bool is_bold) { properties().setBold(is_bold); }
void setSelectable(bool is_selectable) { properties().setSelectable(is_selectable); }
void setSelected (bool is_selected) { properties().setSelected(is_selected); }
void setInactive (bool is_inactive) { properties().setInactive(is_inactive); }
void setSeparator (bool is_separator) { properties().setSeparator(is_separator); }
- bool isBold() const { return properties().isBold(); }
bool isSelectable() const { return properties().isSelectable(); }
bool isSelected() const { return properties().isSelected(); }
bool isInactive() const { return properties().isInactive(); }
diff --git a/src/curses/menu_impl.h b/src/curses/menu_impl.h
index 9e2cbc46..ee5c6288 100644
--- a/src/curses/menu_impl.h
+++ b/src/curses/menu_impl.h
@@ -210,8 +210,6 @@ void Menu<ItemT>::refresh()
mvwhline(m_window, line, 0, 0, m_width);
continue;
}
- if ((*m_items)[m_drawn_position].isBold())
- *this << Format::Bold;
if (m_highlight_enabled && m_drawn_position == m_highlight)
{
*this << Format::Reverse;
@@ -229,8 +227,6 @@ void Menu<ItemT>::refresh()
*this << Color::End;
*this << Format::NoReverse;
}
- if ((*m_items)[m_drawn_position].isBold())
- *this << Format::NoBold;
}
Window::refresh();
}