From 1707eefbec61126a0baa299db1bcaf9ab91350e2 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 20 Sep 2019 07:44:39 +0200 Subject: [PATCH] code more readable --- src/layouts/QskLayoutHint.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/layouts/QskLayoutHint.cpp b/src/layouts/QskLayoutHint.cpp index 2f9e919c..0c0c0de4 100644 --- a/src/layouts/QskLayoutHint.cpp +++ b/src/layouts/QskLayoutHint.cpp @@ -80,16 +80,18 @@ bool QskLayoutHint::isDefault() const qreal QskLayoutHint::combined( int which, qreal value1, qreal value2 ) { - if ( value1 < 0.0 ) - return value2; - - if ( value2 < 0.0 ) - return value1; - if ( which == Qt::MaximumSize ) + { + if ( value1 < 0.0 ) + return value2; + + if ( value2 < 0.0 ) + return value1; + return qMin( value1, value2 ); - else - return qMax( value1, value2 ); + } + + return qMax( value1, value2 ); } #ifndef QT_NO_DEBUG_STREAM