X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.cpp;h=975940310c41b346b90342597a8c907b81190e34;hb=fb12b282f1300123c7f4c7f10525c29cb598e1fe;hp=043b57d3ebb36082561536330f127e151aa3f742;hpb=1a57b660a1c98c2dd90a6fd437ec55d1caf60424;p=lyx.git diff --git a/src/Row.cpp b/src/Row.cpp index 043b57d3eb..975940310c 100644 --- a/src/Row.cpp +++ b/src/Row.cpp @@ -17,31 +17,41 @@ #include #include "Row.h" -#include "debug.h" + +#include "support/debug.h" namespace lyx { Row::Row() - : pos_(0), end_(0), separator(0), hfill(0), label_hfill(0), x(0) + : separator(0), label_hfill(0), x(0), + sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(0), end_(0) {} Row::Row(pos_type pos) - : pos_(pos), end_(0), separator(0), hfill(0), label_hfill(0), x(0) + : separator(0), label_hfill(0), x(0), + sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(pos), end_(0) {} -void Row::pos(pos_type p) +void Row::setCrc(size_type crc) const { - pos_ = p; + changed_ = crc != crc_; + crc_ = crc; } -pos_type Row::pos() const +void Row::setDimension(Dimension const & dim) { - return pos_; + dim_ = dim; +} + + +void Row::pos(pos_type p) +{ + pos_ = p; } @@ -51,19 +61,30 @@ void Row::endpos(pos_type p) } -pos_type Row::endpos() const +void Row::setSelection(pos_type beg, pos_type end) const { - return end_; + if (pos_ >= beg && pos_ <= end) + sel_beg = pos_; + else if (beg > pos_ && beg <= end_) + sel_beg = beg; + else + sel_beg = -1; + + if (end_ >= beg && end_ <= end) + sel_end = end_; + else if (end < end_ && end >= pos_) + sel_end = end; + else + sel_end = -1; } -void Row::dump(const char * s) const +void Row::dump(char const * s) const { - lyxerr << s << " pos: " << pos_ << " end: " << end_ + LYXERR0(s << " pos: " << pos_ << " end: " << end_ << " width: " << dim_.wid << " ascent: " << dim_.asc - << " descent: " << dim_.des - << std::endl; + << " descent: " << dim_.des); }