This commit is contained in:
fourtf
2018-05-23 04:22:17 +02:00
parent bf560d37bd
commit dafbda6a4a
22 changed files with 404 additions and 1103 deletions
@@ -188,7 +188,7 @@ int TextLayoutElement::getMouseOverIndex(const QPoint &abs)
auto app = getApp();
QFontMetrics &metrics = app->fonts->getFontMetrics(this->style, this->scale);
QFontMetrics metrics = app->fonts->getFontMetrics(this->style, this->scale);
int x = this->getRect().left();
@@ -209,7 +209,7 @@ int TextLayoutElement::getXFromIndex(int index)
{
auto app = getApp();
QFontMetrics &metrics = app->fonts->getFontMetrics(this->style, this->scale);
QFontMetrics metrics = app->fonts->getFontMetrics(this->style, this->scale);
if (index <= 0) {
return this->getRect().left();
+2 -2
View File
@@ -139,7 +139,7 @@ void TextElement::addToContainer(MessageLayoutContainer &container, MessageEleme
auto app = getApp();
if (_flags & this->getFlags()) {
QFontMetrics &metrics = app->fonts->getFontMetrics(this->style, container.getScale());
QFontMetrics metrics = app->fonts->getFontMetrics(this->style, container.getScale());
for (Word &word : this->words) {
auto getTextLayoutElement = [&](QString text, int width, bool trailingSpace) {
@@ -242,7 +242,7 @@ TextElement *TimestampElement::formatTime(const QTime &time)
QString format = locale.toString(time, getApp()->settings->timestampFormat);
return new TextElement(format, Flags::Timestamp, MessageColor::System, FontStyle::Medium);
return new TextElement(format, Flags::Timestamp, MessageColor::System, FontStyle::ChatMedium);
}
// TWITCH MODERATION
+1 -1
View File
@@ -158,7 +158,7 @@ class TextElement : public MessageElement
public:
TextElement(const QString &text, MessageElement::Flags flags,
const MessageColor &color = MessageColor::Text,
FontStyle style = FontStyle::Medium);
FontStyle style = FontStyle::ChatMedium);
~TextElement() override = default;
void addToContainer(MessageLayoutContainer &container, MessageElement::Flags flags) override;