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

set attributes in Menu::Refresh() by operators<<()

Browse Source 
this also makes Window::{Bold,UnderLine,Reverse,Altcharset} private.
these should only be called by internals of Window class.
This commit is contained in:
Andrzej Rybczak
2009-09-21 01:34:37 +02:00
parent ec18a34513
commit 1a3dcbfe17
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/menu.h
View File

@@ -737,10 +737,10 @@ template <typename T> void NCurses::Menu<T>::Refresh()
continue; continue;
} }
if ((*itsOptionsPtr)[i]->isBold) if ((*itsOptionsPtr)[i]->isBold)
Window::Bold(1); *this << fmtBold;
if (highlightEnabled && int(i) == itsHighlight) if (highlightEnabled && int(i) == itsHighlight)
{ {
Reverse(1); *this << fmtReverse;
*this << itsHighlightColor; *this << itsHighlightColor;
} }
if ((*itsOptionsPtr)[i]->isSelected && itsSelectedPrefix) if ((*itsOptionsPtr)[i]->isSelected && itsSelectedPrefix)
@@ -753,10 +753,10 @@ template <typename T> void NCurses::Menu<T>::Refresh()
if (highlightEnabled && int(i) == itsHighlight) if (highlightEnabled && int(i) == itsHighlight)
{ {
*this << clEnd; *this << clEnd;
Reverse(0); *this << fmtReverseEnd;
} }
if ((*itsOptionsPtr)[i]->isBold) if ((*itsOptionsPtr)[i]->isBold)
Window::Bold(0); *this << fmtBoldEnd;
line++; line++;
} }
Window::Refresh(); Window::Refresh();

40
src/window.h
View File

@@ -469,26 +469,6 @@ namespace NCurses
/// ///
class BadSize { }; class BadSize { };
/// Sets state of bold attribute (internal use only)
/// @param bold_state state of bold attribute
///
void Bold(bool bold_state) const;
/// Sets state of underline attribute (internal use only)
/// @param underline_state state of underline attribute
///
void Underline(bool underline_state) const;
/// Sets state of reverse attribute (internal use only)
/// @param reverse_state state of reverse attribute
///
void Reverse(bool reverse_state) const;
/// Sets state of altcharset attribute (internal use only)
/// @param altcharset_state state of altcharset attribute
///
void AltCharset(bool altcharset_state) const;
/// Sets colors of window (interal use only) /// Sets colors of window (interal use only)
/// @param fg foregound color /// @param fg foregound color
/// @param bg background color /// @param bg background color
@@ -559,6 +539,26 @@ namespace NCurses
Border itsBorder; Border itsBorder;
private: private:
/// Sets state of bold attribute (internal use only)
/// @param bold_state state of bold attribute
///
void Bold(bool bold_state) const;
/// Sets state of underline attribute (internal use only)
/// @param underline_state state of underline attribute
///
void Underline(bool underline_state) const;
/// Sets state of reverse attribute (internal use only)
/// @param reverse_state state of reverse attribute
///
void Reverse(bool reverse_state) const;
/// Sets state of altcharset attribute (internal use only)
/// @param altcharset_state state of altcharset attribute
///
void AltCharset(bool altcharset_state) const;
/// pointer to container used as history /// pointer to container used as history
std::deque<std::wstring> *itsHistory; std::deque<std::wstring> *itsHistory;