diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
| commit | 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch) | |
| tree | 7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /libraries/rainbow/include | |
| parent | 5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff) | |
| download | MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip | |
merged from 0.6.7 codebase
Diffstat (limited to 'libraries/rainbow/include')
| -rw-r--r-- | libraries/rainbow/include/rainbow.h | 12 | ||||
| -rw-r--r-- | libraries/rainbow/include/rainbow_config.h | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/libraries/rainbow/include/rainbow.h b/libraries/rainbow/include/rainbow.h index b12052b1..67c46300 100644 --- a/libraries/rainbow/include/rainbow.h +++ b/libraries/rainbow/include/rainbow.h @@ -50,7 +50,7 @@ RAINBOW_EXPORT qreal luma(const QColor &); * @since 5.0 */ RAINBOW_EXPORT void getHcy(const QColor &, qreal *hue, qreal *chroma, qreal *luma, - qreal *alpha = 0); + qreal *alpha = 0); /** * Calculate the contrast ratio between two colors, according to the @@ -132,7 +132,7 @@ RAINBOW_EXPORT QColor tint(const QColor &base, const QColor &color, qreal amount /** * Blend two colors into a new color by linear combination. * @code - QColor lighter = Rainbow::mix(myColor, Qt::white) + QColor lighter = Rainbow::mix(myColor, Qt::white) * @endcode * @param c1 first color. * @param c2 second color. @@ -146,9 +146,9 @@ RAINBOW_EXPORT QColor mix(const QColor &c1, const QColor &c2, qreal bias = 0.5); * Blend two colors into a new color by painting the second color over the * first using the specified composition mode. * @code - QColor white(Qt::white); - white.setAlphaF(0.5); - QColor lighter = Rainbow::overlayColors(myColor, white); + QColor white(Qt::white); + white.setAlphaF(0.5); + QColor lighter = Rainbow::overlayColors(myColor, white); @endcode * @param base the base color (alpha channel is ignored). * @param paint the color to be overlayed onto the base color. @@ -156,5 +156,5 @@ RAINBOW_EXPORT QColor mix(const QColor &c1, const QColor &c2, qreal bias = 0.5); */ RAINBOW_EXPORT QColor overlayColors(const QColor &base, const QColor &paint, - QPainter::CompositionMode comp = QPainter::CompositionMode_SourceOver); + QPainter::CompositionMode comp = QPainter::CompositionMode_SourceOver); } diff --git a/libraries/rainbow/include/rainbow_config.h b/libraries/rainbow/include/rainbow_config.h index 9290dc8a..6e467bc7 100644 --- a/libraries/rainbow/include/rainbow_config.h +++ b/libraries/rainbow/include/rainbow_config.h @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ #include <QtCore/QtGlobal> #ifdef RAINBOW_STATIC - #define RAINBOW_EXPORT + #define RAINBOW_EXPORT #else - #ifdef RAINBOW_LIBRARY - #define RAINBOW_EXPORT Q_DECL_EXPORT - #else - #define RAINBOW_EXPORT Q_DECL_IMPORT - #endif + #ifdef RAINBOW_LIBRARY + #define RAINBOW_EXPORT Q_DECL_EXPORT + #else + #define RAINBOW_EXPORT Q_DECL_IMPORT + #endif #endif
\ No newline at end of file |