Fix generating message color on background change
This commit is contained in:
parent
55c5dfec45
commit
001c27cc08
|
@ -349,10 +349,11 @@ export default class AppBackgroundTab extends SliderSuperTab {
|
|||
const onReady = (url?: string) => {
|
||||
// const perf = performance.now();
|
||||
let getPixelPromise: Promise<Uint8ClampedArray>;
|
||||
if(url && !this.theme.background.color) {
|
||||
const backgroundColor = this.getColorsFromWallPaper(wallPaper);
|
||||
if(url && !backgroundColor) {
|
||||
getPixelPromise = averageColor(url);
|
||||
} else {
|
||||
const {canvas} = ChatBackgroundGradientRenderer.create(this.getColorsFromWallPaper(wallPaper));
|
||||
const {canvas} = ChatBackgroundGradientRenderer.create(backgroundColor);
|
||||
getPixelPromise = Promise.resolve(averageColorFromCanvas(canvas));
|
||||
}
|
||||
|
||||
|
@ -369,7 +370,7 @@ export default class AppBackgroundTab extends SliderSuperTab {
|
|||
const slug = (wallPaper as WallPaper.wallPaper).slug ?? '';
|
||||
background.id = wallPaper.id;
|
||||
background.intensity = wallPaper.settings?.intensity ?? 0;
|
||||
background.color = this.getColorsFromWallPaper(wallPaper);
|
||||
background.color = backgroundColor;
|
||||
background.slug = slug;
|
||||
background.highlightningColor = hsla;
|
||||
this.managers.appStateManager.pushToState('settings', rootScope.settings);
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* https://github.com/morethanwords/tweb/blob/master/LICENSE
|
||||
*/
|
||||
|
||||
import renderImageFromUrl from './dom/renderImageFromUrl';
|
||||
import {renderImageFromUrlPromise} from './dom/renderImageFromUrl';
|
||||
|
||||
export function averageColorFromCanvas(canvas: HTMLCanvasElement) {
|
||||
const context = canvas.getContext('2d');
|
||||
|
@ -50,9 +50,7 @@ export function averageColorFromImageSource(imageSource: CanvasImageSource, widt
|
|||
|
||||
export function averageColor(imageUrl: string) {
|
||||
const img = document.createElement('img');
|
||||
return new Promise<Uint8ClampedArray>((resolve) => {
|
||||
renderImageFromUrl(img, imageUrl, () => {
|
||||
resolve(averageColorFromImageSource(img, img.naturalWidth, img.naturalHeight));
|
||||
});
|
||||
return renderImageFromUrlPromise(img, imageUrl, false).then(() => {
|
||||
return averageColorFromImageSource(img, img.naturalWidth, img.naturalHeight);
|
||||
});
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue