mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 17:14:40 +03:00
Code

Finish 1.4.72

Browse Source
This commit is contained in:
Arin Alex 2018-03-26 23:32:31 +03:00
commit 285f3a467b
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 71 LIMEREPORT_VERSION_RELEASE = 72
LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"

29
limereport/objectinspector/propertyItems/lrboolpropitem.cpp
View File

@ -69,20 +69,29 @@ void BoolPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *mod
bool BoolPropItem::paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index) bool BoolPropItem::paint(QPainter *painter, const StyleOptionViewItem &option, const QModelIndex &index)
{ {
if (index.column()==1){
QStyleOptionButton so;
int border = (option.rect.height() - QApplication::style()->pixelMetric(QStyle::PM_IndicatorWidth))/2;
so.rect = option.rect.adjusted(border,border,0,-border);
so.rect.setWidth(QApplication::style()->pixelMetric(QStyle::PM_IndicatorWidth));
if (!isValueReadonly()) QStyle* style = option.widget ? option.widget->style() : QApplication::style();
so.state = QStyle::State_Enabled; int offset = 0;
else
so.state &= ~QStyle::State_Enabled; #ifdef Q_OS_MAC
offset = 2;
#endif
if (index.column()==1){
StyleOptionViewItem so(option);
int border = (option.rect.height() - style->pixelMetric(QStyle::PM_IndicatorWidth))/2;
so.rect = option.rect.adjusted(border,border,0,-border);
so.rect.setWidth(style->pixelMetric(QStyle::PM_IndicatorWidth)+offset);
so.rect.setHeight(style->pixelMetric(QStyle::PM_IndicatorHeight)+offset);
// if (!isValueReadonly())
// so.state = QStyle::State_Enabled;
// else
// so.state &= ~QStyle::State_Enabled;
so.state |= propertyValue().toBool() ? QStyle::State_On : QStyle::State_Off; so.state |= propertyValue().toBool() ? QStyle::State_On : QStyle::State_Off;
option.widget->style()->drawPrimitive(QStyle::PE_IndicatorCheckBox,&so,painter); style->drawPrimitive(QStyle::PE_IndicatorItemViewItemCheck,&so,painter);
return true; return true;
} else return false; } else return false;