mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-04-06 09:23:46 +03:00
Code

Merge tag '1.5.87' into develop

Browse Source 
Finish 1.5.87
This commit is contained in:
Arin Alexander 2021-06-01 23:34:01 +03:00
commit efe17b4183
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -126,7 +126,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5 LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 86 LIMEREPORT_VERSION_RELEASE = 87
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}\\\"

1
include/lrpreviewreportwidget.h
View File

@ -86,6 +86,7 @@ private:
QColor m_previewPageBackgroundColor; QColor m_previewPageBackgroundColor;
QPrinter* m_defaultPrinter; QPrinter* m_defaultPrinter;
void printPages(QPrinter *printer); void printPages(QPrinter *printer);
bool m_scaleChanging;
}; };
} // namespace LimeReport } // namespace LimeReport

5
limereport/lrpreviewreportwidget.cpp
View File

@ -89,7 +89,7 @@ PreviewReportWidget::PreviewReportWidget(ReportEngine *report, QWidget *parent)
QWidget(parent), QWidget(parent),
ui(new Ui::PreviewReportWidget), d_ptr(new PreviewReportWidgetPrivate(this)), ui(new Ui::PreviewReportWidget), d_ptr(new PreviewReportWidgetPrivate(this)),
m_scaleType(FitWidth), m_scalePercent(0), m_previewPageBackgroundColor(Qt::white), m_scaleType(FitWidth), m_scalePercent(0), m_previewPageBackgroundColor(Qt::white),
m_defaultPrinter(0) m_defaultPrinter(0), m_scaleChanging(false)
{ {
ui->setupUi(this); ui->setupUi(this);
d_ptr->m_report = report->d_ptr; d_ptr->m_report = report->d_ptr;
@ -309,6 +309,7 @@ void PreviewReportWidget::saveToFile()
void PreviewReportWidget::setScalePercent(int percent) void PreviewReportWidget::setScalePercent(int percent)
{ {
m_scaleChanging = true;
ui->graphicsView->resetMatrix(); ui->graphicsView->resetMatrix();
d_ptr->m_scalePercent = percent; d_ptr->m_scalePercent = percent;
qreal scaleSize = percent/100.0; qreal scaleSize = percent/100.0;
@ -320,6 +321,7 @@ void PreviewReportWidget::setScalePercent(int percent)
m_scaleType = Percents; m_scaleType = Percents;
m_scalePercent = percent; m_scalePercent = percent;
} }
m_scaleChanging = false;
} }
void PreviewReportWidget::fitWidth() void PreviewReportWidget::fitWidth()
@ -435,6 +437,7 @@ void PreviewReportWidget::activateCurrentPage()
void PreviewReportWidget::slotSliderMoved(int value) void PreviewReportWidget::slotSliderMoved(int value)
{ {
if (m_scaleChanging) return;
int curPage = d_ptr->m_currentPage; int curPage = d_ptr->m_currentPage;
if (ui->graphicsView->verticalScrollBar()->minimum()==value){ if (ui->graphicsView->verticalScrollBar()->minimum()==value){
d_ptr->m_currentPage = 1; d_ptr->m_currentPage = 1;

1
limereport/lrpreviewreportwidget.h
View File

@ -86,6 +86,7 @@ private:
QColor m_previewPageBackgroundColor; QColor m_previewPageBackgroundColor;
QPrinter* m_defaultPrinter; QPrinter* m_defaultPrinter;
void printPages(QPrinter *printer); void printPages(QPrinter *printer);
bool m_scaleChanging;
}; };
} // namespace LimeReport } // namespace LimeReport