diff --git a/doomsday/client/src/ui/framework/textdrawable.cpp b/doomsday/client/src/ui/framework/textdrawable.cpp index cf151ff34c..5f1b0d4faa 100644 --- a/doomsday/client/src/ui/framework/textdrawable.cpp +++ b/doomsday/client/src/ui/framework/textdrawable.cpp @@ -151,9 +151,12 @@ void TextDrawable::init(Atlas &atlas, Font const &font, Font::RichFormat::IStyle setAtlas(atlas); if(style) - { + { d->frontWrap->format.setStyle(*style); d->backWrap->format.setStyle(*style); + + // Previously defined text should be restyled, now. + d->backWrap->plainText = d->backWrap->format.initFromStyledText(d->backWrap->text); } GLTextComposer::setText(d->backWrap->plainText, d->backWrap->format); setFont(font); diff --git a/doomsday/libdeng2/include/de/libdeng2.h b/doomsday/libdeng2/include/de/libdeng2.h index 32b52842ae..91919a0216 100644 --- a/doomsday/libdeng2/include/de/libdeng2.h +++ b/doomsday/libdeng2/include/de/libdeng2.h @@ -78,6 +78,7 @@ #ifdef DENG2_USE_QT # include # include +# include // Qt versioning helper. Qt 4.7 is the oldest we support. # if (QT_VERSION <= QT_VERSION_CHECK(4, 6, 0)) @@ -136,7 +137,6 @@ # define DENG2_DEBUG # ifdef DENG2_USE_QT # define DENG2_ASSERT(x) Q_ASSERT(x) -# include # else # define DENG2_ASSERT(x) assert(x) # endif