Skip to content

Commit 44c5a31

Browse files
committed
ColorEdit, ColorPicker: Fixed alpha preview broken in 1.91.7. (#8336, #8241). [@PathogenDavid]
ImAlphaBlendColors() was broken by ImLerp() change. (cd6c83c)
1 parent 7ae7c90 commit 44c5a31

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

docs/CHANGELOG.txt

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Other changes:
5454
- Windows: legacy SetWindowFontScale() is properly inherited by nested child
5555
windows. Note that an upcoming major release should make this obsolete,
5656
but in the meanwhile it works better now. (#2701, #8138, #1018)
57+
- ColorEdit, ColorPicker: Fixed alpha preview broken in 1.91.7. (#8336, #8241). [@PathogenDavid]
5758
- Tabs, Style: reworked selected overline rendering to better accommodate
5859
for rounded tabs. Reduced default thickness (style.TabBarOverlineSize),
5960
increased default rounding (style.TabRounding). (#8334) [@Kian738, @ocornut]

imgui_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ static inline double ImRsqrt(double x) { return 1.0 / sqrt(x); }
469469
template<typename T> static inline T ImMin(T lhs, T rhs) { return lhs < rhs ? lhs : rhs; }
470470
template<typename T> static inline T ImMax(T lhs, T rhs) { return lhs >= rhs ? lhs : rhs; }
471471
template<typename T> static inline T ImClamp(T v, T mn, T mx) { return (v < mn) ? mn : (v > mx) ? mx : v; }
472-
template<typename T> static inline T ImLerp(T a, T b, float t) { return (T)(a + (b - a) * (T)t); }
472+
template<typename T> static inline T ImLerp(T a, T b, float t) { return (T)(a + (b - a) * t); }
473473
template<typename T> static inline void ImSwap(T& a, T& b) { T tmp = a; a = b; b = tmp; }
474474
template<typename T> static inline T ImAddClampOverflow(T a, T b, T mn, T mx) { if (b < 0 && (a < mn - b)) return mn; if (b > 0 && (a > mx - b)) return mx; return a + b; }
475475
template<typename T> static inline T ImSubClampOverflow(T a, T b, T mn, T mx) { if (b > 0 && (a < mn + b)) return mn; if (b < 0 && (a > mx + b)) return mx; return a - b; }

0 commit comments

Comments
 (0)