From 418189d39c447772ef84d9c295d7cd8c7805b763 Mon Sep 17 00:00:00 2001 From: fourtf Date: Tue, 23 Jan 2018 22:00:58 +0100 Subject: [PATCH] Fixes #230 appearence settings not updating --- src/messages/layouts/messagelayout.cpp | 4 ++-- src/messages/messageelement.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/messages/layouts/messagelayout.cpp b/src/messages/layouts/messagelayout.cpp index 475076c0..31c69e0c 100644 --- a/src/messages/layouts/messagelayout.cpp +++ b/src/messages/layouts/messagelayout.cpp @@ -104,11 +104,11 @@ bool MessageLayout::layout(int width, float scale, MessageElement::Flags flags) // update word sizes if needed if (imagesChanged) { - // fourtf: update images + // this->container.updateImages(); this->addFlags(MessageLayout::RequiresBufferUpdate); } if (textChanged) { - // fourtf: update text + // this->container.updateText(); this->addFlags(MessageLayout::RequiresBufferUpdate); } if (widthChanged || wordMaskChanged) { diff --git a/src/messages/messageelement.cpp b/src/messages/messageelement.cpp index 84c879a8..42976eea 100644 --- a/src/messages/messageelement.cpp +++ b/src/messages/messageelement.cpp @@ -155,9 +155,10 @@ void TextElement::addToContainer(MessageLayoutContainer &container, MessageEleme return e; }; - if (word.width == -1) { - word.width = metrics.width(word.text); - } + // fourtf: add again + // if (word.width == -1) { + word.width = metrics.width(word.text); + // } // see if the text fits in the current line if (container.fitsInLine(word.width)) {