From d36defd3dcd021dc02218a508ef6508dd8a0f565 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Sat, 12 Oct 2019 23:10:57 +0300 Subject: [PATCH] version has been changed --- common.pri | 2 +- limereport/lrbanddesignintf.cpp | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/common.pri b/common.pri index 7913e8e..20519eb 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 = 13 +LIMEREPORT_VERSION_RELEASE = 14 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp index 6881440..30661bd 100644 --- a/limereport/lrbanddesignintf.cpp +++ b/limereport/lrbanddesignintf.cpp @@ -590,16 +590,12 @@ void BandDesignIntf::preparePopUpMenu(QMenu &menu) currAction = menu.addAction(tr("Keep top space")); currAction->setCheckable(true); - currAction->setChecked(keepBottomSpaceOption()); + currAction->setChecked(keepTopSpace()); currAction = menu.addAction(tr("Keep bottom space")); currAction->setCheckable(true); currAction->setChecked(keepBottomSpace()); - currAction = menu.addAction(tr("Keep top space")); - currAction->setCheckable(true); - currAction->setChecked(keepTopSpace()); - currAction = menu.addAction(tr("Print if empty")); currAction->setCheckable(true); currAction->setChecked(printIfEmpty()); @@ -1138,7 +1134,7 @@ void BandDesignIntf::updateItemSize(DataSourceManager* dataManager, RenderPass p arrangeSubItems(pass, dataManager); if (autoHeight()){ if (!keepTopSpace()) { - qreal minTop = findMinTop() + m_shiftItems - spaceBorder; + qreal minTop = findMinTop() + m_shiftItems; foreach (BaseDesignIntf* item, childBaseItems()) { item->setY(item->y() - minTop); }