mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-03 20:04:43 +03:00
Code Activity

#467 Fixed

Browse Source
This commit is contained in:
Arin Alex
2024-07-31 20:04:07 +03:00
parent f07a356899
commit e53e7a993b
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
limereport/lrbasedesignintf.cpp
View File

@@ -1524,6 +1524,10 @@ void BaseDesignIntf::setPossibleMoveFlags(int directionsFlags)
m_possibleMoveDirectionFlags = directionsFlags;
}
int BaseDesignIntf::marginSize() const {
return m_margin + (m_reportSettings != 0 ? m_reportSettings->baseItemPadding() : 0);
}
void BaseDesignIntf::setMarginSize(int value)
{
if (m_margin!=value){

4
limereport/lrbasedesignintf.h
View File

@@ -295,9 +295,7 @@ public:
int possibleMoveDirectionFlags() const;
void setPossibleMoveFlags(int directionsFlags);
int marginSize() const {
return m_margin + m_reportSettings != 0 ? m_reportSettings->baseItemPadding() : 0;
}
int marginSize() const;
void setMarginSize(int value);
QString itemTypeName() const;

6
limereport/lrpagedesignintf.cpp
View File

@@ -422,11 +422,6 @@ void PageDesignIntf::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
m_selectionRect = 0;
m_multiSelectStarted = false;
}
// if(m_infoPosRect)
// {
// delete m_infoPosRect;
// m_infoPosRect = 0;
// }
QGraphicsScene::mouseReleaseEvent(event);
}
@@ -524,6 +519,7 @@ BaseDesignIntf *PageDesignIntf::addReportItem(const QString &itemType, QPointF p
if (band) {
BaseDesignIntf *reportItem = addReportItem(itemType, band, band);
reportItem->setPos(placePosOnGrid(band->mapFromScene(pos)));
reportItem->setReportSettings(m_reportSettings);
reportItem->setSize(placeSizeOnGrid(size));
reportItem->setUnitType(pageItem()->unitType());
return reportItem;

8
limereport/scripteditor/lrscripthighlighter.cpp
View File

@@ -248,16 +248,16 @@ ScriptHighlighter::ScriptHighlighter(QTextDocument* parent):
}
if ( isColorDark(QPalette().window().color())){
m_formats[NumberFormat].setForeground(Qt::darkBlue);
m_formats[NumberFormat].setForeground(QColor("#45c6d1"));
m_formats[StringFormat].setForeground(Qt::darkGreen);
m_formats[KeywordFormat].setForeground(Qt::darkYellow);
m_formats[CommentFormat].setForeground(Qt::darkGreen);
m_formats[KeywordFormat].setForeground(QColor("#cd5125"));
m_formats[CommentFormat].setForeground(QColor("#80807e"));
m_formats[CommentFormat].setFontItalic(true);
} else {
m_formats[NumberFormat].setForeground(QColor("#ff6aad"));
m_formats[StringFormat].setForeground(QColor("#b27f40"));
m_formats[KeywordFormat].setForeground(QColor("#45c5d5"));
m_formats[CommentFormat].setForeground(QColor("#a1a4a9"));
m_formats[CommentFormat].setForeground(QColor("#a8aaab"));
m_formats[CommentFormat].setFontItalic(true);
}
}