version 2.32.4
QAD::CursorOverrider now nave second argument in contructor - `bool condition = true` if it false, no operations performed
This commit is contained in:
+1
-1
@@ -4,7 +4,7 @@ cmake_policy(SET CMP0072 NEW) # FindOpenGL prefers GLVND by default
|
||||
project(QAD)
|
||||
set(QAD_MAJOR 2)
|
||||
set(QAD_MINOR 32)
|
||||
set(QAD_REVISION 3)
|
||||
set(QAD_REVISION 4)
|
||||
set(QAD_SUFFIX )
|
||||
set(QAD_COMPANY SHS)
|
||||
set(QAD_DOMAIN org.SHS)
|
||||
|
||||
@@ -163,17 +163,20 @@ QString QAD::IODevice::toString() const {
|
||||
|
||||
// QAD::CursorOverrider
|
||||
|
||||
QAD::CursorOverrider::CursorOverrider(const QCursor & c) {
|
||||
QAD::CursorOverrider::CursorOverrider(const QCursor & c, bool condition): cond(condition) {
|
||||
if (!cond) return;
|
||||
QApplication::setOverrideCursor(c);
|
||||
}
|
||||
|
||||
|
||||
QAD::CursorOverrider::~CursorOverrider() {
|
||||
if (!cond) return;
|
||||
restore();
|
||||
}
|
||||
|
||||
|
||||
void QAD::CursorOverrider::restore() {
|
||||
if (!cond) return;
|
||||
if (!on) return;
|
||||
on = false;
|
||||
QApplication::restoreOverrideCursor();
|
||||
|
||||
@@ -130,11 +130,12 @@ struct QAD_UTILS_EXPORT MathMatrix {
|
||||
|
||||
class QAD_UTILS_EXPORT CursorOverrider {
|
||||
public:
|
||||
CursorOverrider(const QCursor & c = Qt::WaitCursor);
|
||||
CursorOverrider(const QCursor & c = Qt::WaitCursor, bool condition = true);
|
||||
~CursorOverrider();
|
||||
void restore();
|
||||
|
||||
private:
|
||||
bool cond = true;
|
||||
bool on = true;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user