From d0e7aa65f5daeab71bdd9e00931c61573337acbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 27 May 2015 09:52:47 +0200 Subject: [PATCH] used default values in QML context properties to avoid warnings --- YACReaderLibrary/grid_comics_view.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp index f51e2554..aca99e1e 100644 --- a/YACReaderLibrary/grid_comics_view.cpp +++ b/YACReaderLibrary/grid_comics_view.cpp @@ -84,7 +84,7 @@ void GridComicsView::setModel(ComicModel *model) ctxt->setContextProperty("textColor", "#636363"); //fonts settings ctxt->setContextProperty("fontSize", 11); - ctxt->setContextProperty("fontFamily", "none"); + ctxt->setContextProperty("fontFamily", QApplication::font().family()); ctxt->setContextProperty("fontSpacing", 0.5); #else @@ -97,8 +97,11 @@ void GridComicsView::setModel(ComicModel *model) ctxt->setContextProperty("textColor", "#E6E6E6"); ctxt->setContextProperty("dropShadow",false); //fonts settings - ctxt->setContextProperty("fontSize", "12"); - ctxt->setContextProperty("fontFamily", "Arial"); + int fontSize = QApplication::font().pointSize(); + if(fontSize == -1) + fontSize = QApplication::font().pixelSize(); + ctxt->setContextProperty("fontSize", fontSize); + ctxt->setContextProperty("fontFamily", QApplication::font().family()); ctxt->setContextProperty("fontSpacing", 0.5); #endif