rename PieceDescriptor to just Piece

This commit is contained in:
josh committed 2016-07-30 09:52:46 -04:00
1 parent cef49e9e6e
commit 7064afc1f1
5 files changed
+65 -62

No files matched your search

+11 -11
View File
@@ -118,7 +118,7 @@ bool Window::create(std::shared_ptr<Buffer> buffer)
m_shaders.text->set_color(1.0, 1.0, 1.0, 1.0);
m_buffer = buffer;
m_start_piece = m_buffer->piece_table->start_descriptor->next;
m_start_piece = m_buffer->piece_table->start_piece->next;
resize();
@@ -229,8 +229,8 @@ void Window::handle_key(uint32_t scancode, uint32_t mod)
void Window::scroll_down()
{
if ((m_start_piece != m_buffer->piece_table->end_descriptor) &&
(m_start_piece->next != m_buffer->piece_table->end_descriptor))
if ((m_start_piece != m_buffer->piece_table->end_piece) &&
(m_start_piece->next != m_buffer->piece_table->end_piece))
{
m_start_piece = m_start_piece->next;
redraw();
@@ -239,8 +239,8 @@ void Window::scroll_down()
void Window::scroll_up()
{
if ((m_start_piece != m_buffer->piece_table->start_descriptor) &&
(m_start_piece->prev != m_buffer->piece_table->start_descriptor))
if ((m_start_piece != m_buffer->piece_table->start_piece) &&
(m_start_piece->prev != m_buffer->piece_table->start_piece))
{
m_start_piece = m_start_piece->prev;
redraw();
@@ -270,13 +270,13 @@ void Window::redraw()
int line_height = m_font.get_line_height();
int x = 0;
int y = m_height - line_height;
for (PieceTable::PieceDescriptor * pd = m_start_piece;
pd != m_buffer->piece_table->end_descriptor;
pd = pd->next)
for (PieceTable::Piece * piece = m_start_piece;
piece != m_buffer->piece_table->end_piece;
piece = piece->next)
{
for (int i = 0, len = pd->length; i < len; i++)
for (int i = 0, len = piece->length; i < len; i++)
{
uint8_t c = pd->start[i];
uint8_t c = piece->start[i];
auto g = m_font.get_glyph(c);
m_shaders.text->set_position(x, y);
g->render();
@@ -290,7 +290,7 @@ void Window::redraw()
x += advance;
}
}
if (pd->eol())
if (piece->eol())
{
y -= line_height;
x = 0;
+1 -1
View File
@@ -35,7 +35,7 @@ protected:
std::shared_ptr<Buffer> m_buffer;
PieceTable::PieceDescriptor * m_start_piece;
PieceTable::Piece * m_start_piece;
};
#endif