MrBesen/tweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix generating message color on background change

Browse Source
This commit is contained in:
Eduard Kuzmenko 2022-11-08 15:35:40 +04:00
parent 55c5dfec45
commit 001c27cc08
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/sidebarLeft/tabs/background.ts
View File

@ -349,10 +349,11 @@ export default class AppBackgroundTab extends SliderSuperTab {
const onReady = (url?: string) => { const onReady = (url?: string) => {
// const perf = performance.now(); // const perf = performance.now();
let getPixelPromise: Promise<Uint8ClampedArray>; let getPixelPromise: Promise<Uint8ClampedArray>;
if(url && !this.theme.background.color) { const backgroundColor = this.getColorsFromWallPaper(wallPaper);
if(url && !backgroundColor) {
getPixelPromise = averageColor(url); getPixelPromise = averageColor(url);
} else { } else {
const {canvas} = ChatBackgroundGradientRenderer.create(this.getColorsFromWallPaper(wallPaper)); const {canvas} = ChatBackgroundGradientRenderer.create(backgroundColor);
getPixelPromise = Promise.resolve(averageColorFromCanvas(canvas)); getPixelPromise = Promise.resolve(averageColorFromCanvas(canvas));
} }
@ -369,7 +370,7 @@ export default class AppBackgroundTab extends SliderSuperTab {
const slug = (wallPaper as WallPaper.wallPaper).slug ?? ''; const slug = (wallPaper as WallPaper.wallPaper).slug ?? '';
background.id = wallPaper.id; background.id = wallPaper.id;
background.intensity = wallPaper.settings?.intensity ?? 0; background.intensity = wallPaper.settings?.intensity ?? 0;
background.color = this.getColorsFromWallPaper(wallPaper); background.color = backgroundColor;
background.slug = slug; background.slug = slug;
background.highlightningColor = hsla; background.highlightningColor = hsla;
this.managers.appStateManager.pushToState('settings', rootScope.settings); this.managers.appStateManager.pushToState('settings', rootScope.settings);

8
src/helpers/averageColor.ts
View File

@ -4,7 +4,7 @@
* https://github.com/morethanwords/tweb/blob/master/LICENSE * https://github.com/morethanwords/tweb/blob/master/LICENSE
*/ */
import renderImageFromUrl from './dom/renderImageFromUrl'; import {renderImageFromUrlPromise} from './dom/renderImageFromUrl';
export function averageColorFromCanvas(canvas: HTMLCanvasElement) { export function averageColorFromCanvas(canvas: HTMLCanvasElement) {
const context = canvas.getContext('2d'); const context = canvas.getContext('2d');
@ -50,9 +50,7 @@ export function averageColorFromImageSource(imageSource: CanvasImageSource, widt
export function averageColor(imageUrl: string) { export function averageColor(imageUrl: string) {
const img = document.createElement('img'); const img = document.createElement('img');
return new Promise<Uint8ClampedArray>((resolve) => { return renderImageFromUrlPromise(img, imageUrl, false).then(() => {
renderImageFromUrl(img, imageUrl, () => { return averageColorFromImageSource(img, img.naturalWidth, img.naturalHeight);
resolve(averageColorFromImageSource(img, img.naturalWidth, img.naturalHeight));
});
}); });
}; };