From afcdee3e243f90d9b732550420069045966815b4 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Thu, 4 Jul 2019 20:41:58 +0300 Subject: [PATCH] Font editor has been fixed --- common.pri | 2 +- limereport/items/editors/lrfonteditorwidget.cpp | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/common.pri b/common.pri index e4c3616..a0012c5 100644 --- a/common.pri +++ b/common.pri @@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 5 -LIMEREPORT_VERSION_RELEASE = 0 +LIMEREPORT_VERSION_RELEASE = 1 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/limereport/items/editors/lrfonteditorwidget.cpp b/limereport/items/editors/lrfonteditorwidget.cpp index 5d1a306..3a8cf0d 100644 --- a/limereport/items/editors/lrfonteditorwidget.cpp +++ b/limereport/items/editors/lrfonteditorwidget.cpp @@ -140,19 +140,24 @@ void FontEditorWidget::slotPropertyChanged(const QString &objectName, const QStr void FontEditorWidgetForPage::slotFontChanged(const QFont& font) { - m_page->setFont(font); + if (!ignoreSlots()) + m_page->setFont(font); } void FontEditorWidgetForPage::slotFontSizeChanged(const QString& value) { - FontEditorWidget::slotFontSizeChanged(value); - m_page->setFont(resFont()); + if (!ignoreSlots()){ + FontEditorWidget::slotFontSizeChanged(value); + m_page->setFont(resFont()); + } } void FontEditorWidgetForPage::slotFontAttribsChanged(bool value) { - FontEditorWidget::slotFontAttribsChanged(value); - m_page->setFont(resFont()); + if (!ignoreSlots()){ + FontEditorWidget::slotFontAttribsChanged(value); + m_page->setFont(resFont()); + } } #ifdef HAVE_REPORT_DESIGNER