d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into decrypt-sidebar

Browse source
This commit is contained in:
Joseph Donofry 2020-04-23 18:40:07 -04:00 committed by GitHub
commit 69b0b68f92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -13,6 +13,7 @@
- Fix Binding restorMode flooding logs on Qt 5.14.2+ - Fix Binding restorMode flooding logs on Qt 5.14.2+
- Fix with some qml styles hidden menu items leave empty space - Fix with some qml styles hidden menu items leave empty space
- Fix encrypted messages not showing a user in the sidebar - Fix encrypted messages not showing a user in the sidebar
- Fix hangs when generating colors with some system theme color schemes (#172)
## [0.7.0] -- 2020-04-19 ## [0.7.0] -- 2020-04-19

6
src/Utils.cpp
View file

@ -541,6 +541,7 @@ utils::generateContrastingHexColor(const QString &input, const QString &backgrou
// If the contrast doesn't meet our criteria, // If the contrast doesn't meet our criteria,
// try again and again until they do by modifying first // try again and again until they do by modifying first
// the lightness and then the saturation of the color. // the lightness and then the saturation of the color.
int iterationCount = 9;
while (contrast < 5) { while (contrast < 5) {
// if our lightness is at it's bounds, try changing // if our lightness is at it's bounds, try changing
// saturation instead. // saturation instead.
@ -587,6 +588,11 @@ utils::generateContrastingHexColor(const QString &input, const QString &backgrou
} }
} }
} }
// don't loop forever, just give up at some point!
// Someone smart may find a better solution
if (--iterationCount < 0)
break;
} }
// get the hex value of the generated color. // get the hex value of the generated color.