diff --git a/CMakeLists.txt b/CMakeLists.txt index b546f80..16e826e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0) cmake_policy(SET CMP0017 NEW) # need include() with .cmake project(qad) set(qad_MAJOR 1) -set(qad_MINOR 9) +set(qad_MINOR 10) set(qad_REVISION 0) set(qad_SUFFIX ) set(qad_COMPANY SHS) @@ -58,6 +58,7 @@ endif() message("----------QAD----------") message(" Build for ${QtVersions}") +message(" Version: ${qad_VERSION} ") message(" Linkage: ${qad_LIB_TYPE_MSG}") message(" Type : ${qad_BUILD_TYPE}") if (NOT LOCAL) diff --git a/libs/widgets/scroll_spin_box.cpp b/libs/widgets/scroll_spin_box.cpp index 4b650b8..faa1055 100644 --- a/libs/widgets/scroll_spin_box.cpp +++ b/libs/widgets/scroll_spin_box.cpp @@ -89,7 +89,7 @@ bool ScrollSpinBox::eventFilter(QObject * o, QEvent * e) { void ScrollSpinBox::mousePress(QMouseEvent * e) { - if (canceled) return; + if (canceled || !isEnabled()) return; if (e->button() == Qt::RightButton) { canceled = true; ui->spin->setExpression(last_text); @@ -104,12 +104,13 @@ void ScrollSpinBox::mousePress(QMouseEvent * e) { void ScrollSpinBox::mouseRelease(QMouseEvent * e) { + if (!isEnabled()) return; if (e->buttons() == Qt::NoButton) canceled = false; } void ScrollSpinBox::mouseMove(QMouseEvent * e) { - if (canceled) return; + if (canceled || !isEnabled()) return; if (e->buttons().testFlag(Qt::LeftButton)) { double dv = (down_pos.y() - e->pos().y()) * scroll_scale; if (dv != 0.) {