mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-20 06:30:03 +03:00
Code Activity

Merge branch 'develop' into feature/addNewTextInPreview

Browse Source 
# Conflicts:
#	limereport/lrpagedesignintf.cpp
#	limereport/lrpagedesignintf.h
This commit is contained in:
Arin Alexander
2019-03-01 17:59:56 +03:00
parent 78cac1126c 8854f59916
commit ca57e5c195
14 changed files with 322 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
limereport/lrpagedesignintf.h
View File

@@ -166,6 +166,7 @@ namespace LimeReport {
bool isUpdating(){return m_updating;}
void endUpdate();
void rectMoved(QRectF itemRect, BaseDesignIntf* container = 0);
void itemMoved(BaseDesignIntf* item);
bool magneticMovement() const;
void setMagneticMovement(bool magneticMovement);
@@ -275,7 +276,7 @@ namespace LimeReport {
const QVariant& oldPropertyValue,
const QVariant& newPropertyValue);
void changeSelectedGroupProperty(const QString& name,const QVariant& value);
void activateItemToJoin(QRectF itemRect, QList<ItemProjections>& items);
private:
enum JoinType{Width, Height};
LimeReport::PageItemDesignIntf::Ptr m_pageItem;