napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamaresui] Use Qt max, min, bound

Browse Source
This commit is contained in:
Adriaan de Groot 2022-04-16 12:51:11 +02:00
parent 58306de28a
commit 87ff7ae0da
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcalamaresui/widgets/waitingspinnerwidget.cpp
View File

@ -28,14 +28,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
// Own includes
#include "waitingspinnerwidget.h" #include "waitingspinnerwidget.h"
// Standard includes
#include <algorithm>
#include <cmath>
// Qt includes
#include <QPainter> #include <QPainter>
#include <QTimer> #include <QTimer>
@ -76,7 +70,7 @@ currentLineColor( int countDistance, int totalNrOfLines, qreal trailFadePerc, qr
qreal resultAlpha = color.alphaF() - gradient * countDistance; qreal resultAlpha = color.alphaF() - gradient * countDistance;
// If alpha is out of bounds, clip it. // If alpha is out of bounds, clip it.
resultAlpha = std::min( 1.0, std::max( 0.0, resultAlpha ) ); resultAlpha = qBound( 0.0, resultAlpha, 1.0 );
color.setAlphaF( resultAlpha ); color.setAlphaF( resultAlpha );
} }
return color; return color;
@ -316,7 +310,7 @@ WaitingSpinnerWidget::isSpinning() const
void void
WaitingSpinnerWidget::setRoundness( qreal roundness ) WaitingSpinnerWidget::setRoundness( qreal roundness )
{ {
_roundness = std::max( 0.0, std::min( 100.0, roundness ) ); _roundness = qBound( 0.0, roundness, 100.0 );
} }
void void
@ -374,7 +368,7 @@ WaitingSpinnerWidget::updateSize()
{ {
QFontMetrics fm( font() ); QFontMetrics fm( font() );
QSize textSize = QSize( fm.horizontalAdvance( _text ), fm.height() ); QSize textSize = QSize( fm.horizontalAdvance( _text ), fm.height() );
setFixedSize( std::max( size, textSize.width() ), size + size / 4 + textSize.height() ); setFixedSize( qMax( size, textSize.width() ), size + size / 4 + textSize.height() );
} }
} }