Cleanup/fix some code

This commit is contained in:
Frank LENORMAND 2016-02-17 16:06:20 +02:00
parent ac08a1fa75
commit e74878c299
5 changed files with 5 additions and 6 deletions

View File

@ -64,6 +64,6 @@
face StatusCursor ${orange},${white_light} face StatusCursor ${orange},${white_light}
face Prompt ${black_light} face Prompt ${black_light}
face MatchingChar default+b face MatchingChar default+b
face BufferPadding ${grey_dark},${white} face BufferPadding ${grey_dark},${white}
" "
} }

View File

@ -64,6 +64,6 @@
face StatusCursor ${base00},${base3} face StatusCursor ${base00},${base3}
face Prompt yellow face Prompt yellow
face MatchingChar default+b face MatchingChar default+b
face BufferPadding ${base01},${base03} face BufferPadding ${base01},${base03}
" "
} }

View File

@ -121,7 +121,7 @@ FaceRegistry::FaceRegistry()
{ "StatusCursor", Face{ Color::Black, Color::Cyan } }, { "StatusCursor", Face{ Color::Black, Color::Cyan } },
{ "Prompt", Face{ Color::Yellow, Color::Default } }, { "Prompt", Face{ Color::Yellow, Color::Default } },
{ "MatchingChar", Face{ Color::Default, Color::Default, Attribute::Bold } }, { "MatchingChar", Face{ Color::Default, Color::Default, Attribute::Bold } },
{ "BufferPadding", Face{ Color::Blue, Color::Default, Attribute::Bold } }, { "BufferPadding", Face{ Color::Blue, Color::Default } },
} }
{} {}

View File

@ -7,7 +7,6 @@
#include "keys.hh" #include "keys.hh"
#include "register_manager.hh" #include "register_manager.hh"
#include "utf8_iterator.hh" #include "utf8_iterator.hh"
#include "face_registry.hh"
#include <algorithm> #include <algorithm>
@ -361,7 +360,7 @@ void NCursesUI::draw(const DisplayBuffer& display_buffer,
++line_index; ++line_index;
} }
set_face(m_window, { Color::Blue, Color::Default }, padding_face); set_face(m_window, padding_face, default_face);
const DisplayLine padding_line = m_buffer_padding_str; const DisplayLine padding_line = m_buffer_padding_str;
const DisplayLine* padding_line_ptr = m_buffer_padding_type != BufferPaddingType::None ? const DisplayLine* padding_line_ptr = m_buffer_padding_type != BufferPaddingType::None ?

View File

@ -124,7 +124,7 @@ private:
int m_wheel_up_button = 4; int m_wheel_up_button = 4;
int m_wheel_down_button = 5; int m_wheel_down_button = 5;
String m_buffer_padding_str = "~"; String m_buffer_padding_str = "~";
BufferPaddingType m_buffer_padding_type = BufferPaddingType::None; BufferPaddingType m_buffer_padding_type = BufferPaddingType::None;
bool m_set_title = true; bool m_set_title = true;