Skip to content

Commit 5dee663

Browse files
authored
Merge pull request #4168 from Tyriar/4128
Ensure texture atlas comparison uses rgba not object
2 parents e3e3c34 + 2a602ef commit 5dee663

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

addons/xterm-addon-canvas/src/atlas/CharAtlasUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ export function configEquals(a: ICharAtlasConfig, b: ICharAtlasConfig): boolean
4545
a.allowTransparency === b.allowTransparency &&
4646
a.scaledCharWidth === b.scaledCharWidth &&
4747
a.scaledCharHeight === b.scaledCharHeight &&
48-
a.colors.foreground === b.colors.foreground &&
49-
a.colors.background === b.colors.background;
48+
a.colors.foreground.rgba === b.colors.foreground.rgba &&
49+
a.colors.background.rgba === b.colors.background.rgba;
5050
}
5151

5252
export function is256Color(colorCode: number): boolean {

addons/xterm-addon-webgl/src/atlas/CharAtlasUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ export function configEquals(a: ICharAtlasConfig, b: ICharAtlasConfig): boolean
7070
a.scaledCharHeight === b.scaledCharHeight &&
7171
a.drawBoldTextInBrightColors === b.drawBoldTextInBrightColors &&
7272
a.minimumContrastRatio === b.minimumContrastRatio &&
73-
a.colors.foreground === b.colors.foreground &&
74-
a.colors.background === b.colors.background;
73+
a.colors.foreground.rgba === b.colors.foreground.rgba &&
74+
a.colors.background.rgba === b.colors.background.rgba;
7575
}
7676

7777
export function is256Color(colorCode: number): boolean {

0 commit comments

Comments
 (0)