xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneeded Window::m_range post refactoring

Browse Source
This commit is contained in:
Maxime Coste 2018-06-12 06:48:48 +10:00
parent 0d3a1b5955
commit 0bdde991ea
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/window.cc
View File

@ -170,10 +170,7 @@ const DisplayBuffer& Window::update_display_buffer(const Context& context)
m_display_buffer.optimize(); m_display_buffer.optimize();
m_last_setup = build_setup(context); m_last_setup = build_setup(context);
set_position(setup.window_pos - m_position_offset);
m_position.line = clamp(setup.window_pos.line - m_position_offset.line, 0_line, buffer().line_count()-1);
m_position.column = std::max(0_col, setup.window_pos.column - m_position_offset.column);
m_range = setup.window_range;
if (profile and not (buffer().flags() & Buffer::Flags::Debug)) if (profile and not (buffer().flags() & Buffer::Flags::Debug))
{ {
@ -188,7 +185,7 @@ const DisplayBuffer& Window::update_display_buffer(const Context& context)
void Window::set_position(DisplayCoord position) void Window::set_position(DisplayCoord position)
{ {
m_position.line = std::max(0_line, position.line); m_position.line = clamp(position.line, 0_line, buffer().line_count()-1);
m_position.column = std::max(0_col, position.column); m_position.column = std::max(0_col, position.column);
} }

3
src/window.hh
View File

@ -22,8 +22,6 @@ public:
const DisplayCoord& position() const { return m_position; } const DisplayCoord& position() const { return m_position; }
void set_position(DisplayCoord position); void set_position(DisplayCoord position);
const DisplayCoord& range() const { return m_range; }
const DisplayCoord& dimensions() const { return m_dimensions; } const DisplayCoord& dimensions() const { return m_dimensions; }
void set_dimensions(DisplayCoord dimensions, bool offset_pos = false); void set_dimensions(DisplayCoord dimensions, bool offset_pos = false);
@ -62,7 +60,6 @@ private:
DisplayCoord m_position; DisplayCoord m_position;
DisplayCoord m_position_offset; DisplayCoord m_position_offset;
DisplayCoord m_range;
DisplayCoord m_dimensions; DisplayCoord m_dimensions;
DisplayBuffer m_display_buffer; DisplayBuffer m_display_buffer;