added text selection

This commit is contained in:
fourtf
2017-09-12 19:06:16 +02:00
parent 8b40393023
commit 81b1a8774b
18 changed files with 585 additions and 239 deletions
+11 -4
View File
@@ -14,7 +14,7 @@ WordPart::WordPart(Word &word, int x, int y, int lineNumber, const QString &copy
, _width(word.getWidth())
, _height(word.getHeight())
, _lineNumber(lineNumber)
, _trailingSpace(word.hasTrailingSpace() & allowTrailingSpace)
, _trailingSpace(!word.getCopyText().isEmpty() && word.hasTrailingSpace() & allowTrailingSpace)
{
}
@@ -28,7 +28,7 @@ WordPart::WordPart(Word &word, int x, int y, int width, int height, int lineNumb
, _width(width)
, _height(height)
, _lineNumber(lineNumber)
, _trailingSpace(word.hasTrailingSpace() & allowTrailingSpace)
, _trailingSpace(!word.getCopyText().isEmpty() && word.hasTrailingSpace() & allowTrailingSpace)
{
}
@@ -80,7 +80,7 @@ int WordPart::getBottom() const
QRect WordPart::getRect() const
{
return QRect(_x, _y, _width, _height);
return QRect(_x, _y, _width, _height - 1);
}
const QString WordPart::getCopyText() const
@@ -98,10 +98,17 @@ const QString &WordPart::getText() const
return _text;
}
int WordPart::getLineNumber()
int WordPart::getLineNumber() const
{
return _lineNumber;
}
int WordPart::getCharacterLength() const
{
// return (this->getWord().isImage() ? 1 : this->getText().length()) + (_trailingSpace ? 1 :
// 0);
return this->getWord().isImage() ? 2 : this->getText().length() + 1;
}
} // namespace messages
} // namespace chatterino