From 11713304517ef16be5ff4f3ba70446d0759736ef Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 4 Oct 2022 21:03:32 +0200 Subject: [PATCH] added minimum contrast ratio setting --- .../appearanceSettingsTab.component.pug | 12 ++++++++++++ tabby-terminal/src/config.ts | 1 + tabby-terminal/src/frontends/xterm.css | 15 --------------- tabby-terminal/src/frontends/xtermFrontend.ts | 8 +++++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tabby-terminal/src/components/appearanceSettingsTab.component.pug b/tabby-terminal/src/components/appearanceSettingsTab.component.pug index a597508421..0e87e562d7 100644 --- a/tabby-terminal/src/components/appearanceSettingsTab.component.pug +++ b/tabby-terminal/src/components/appearanceSettingsTab.component.pug @@ -119,6 +119,18 @@ h3.mb-3(translate) Appearance (ngModelChange)='config.save()', ) + .form-line + .header + .title(translate) Minimum contrast ratio + input.form-control( + type='number', + min='1', + max='21', + step='0.5', + [(ngModel)]='config.store.terminal.minimumContrastRatio', + (ngModelChange)='config.save()' + ) + .form-line .header .title(translate) Fallback font diff --git a/tabby-terminal/src/config.ts b/tabby-terminal/src/config.ts index bbcfaffaa5..1cd6b082fb 100644 --- a/tabby-terminal/src/config.ts +++ b/tabby-terminal/src/config.ts @@ -69,6 +69,7 @@ export class TerminalConfigProvider extends ConfigProvider { scrollbackLines: 25000, drawBoldTextInBrightColors: true, sixel: true, + minimumContrastRatio: 4, }, } diff --git a/tabby-terminal/src/frontends/xterm.css b/tabby-terminal/src/frontends/xterm.css index 21f9c016b3..c60099b7b9 100644 --- a/tabby-terminal/src/frontends/xterm.css +++ b/tabby-terminal/src/frontends/xterm.css @@ -17,18 +17,3 @@ right: 1px; pointer-events: none; } - -.xterm-find-result-decoration { - box-sizing: content-box; - - border-radius: 3px; - padding: 2px; - margin: -2px; - outline: 2px solid yellow; - backdrop-filter: contrast(2); -} - -.xterm-find-active-result-decoration { - backdrop-filter: contrast(4); - outline-width: 2px !important; -} diff --git a/tabby-terminal/src/frontends/xtermFrontend.ts b/tabby-terminal/src/frontends/xtermFrontend.ts index a944a5c7aa..4104896263 100644 --- a/tabby-terminal/src/frontends/xtermFrontend.ts +++ b/tabby-terminal/src/frontends/xtermFrontend.ts @@ -378,6 +378,7 @@ export class XTermFrontend extends Frontend { this.xterm.options.drawBoldTextInBrightColors = config.terminal.drawBoldTextInBrightColors this.xterm.options.fontWeight = config.terminal.fontWeight this.xterm.options.fontWeightBold = config.terminal.fontWeightBold + this.xterm.options.minimumContrastRatio = config.terminal.minimumContrastRatio this.configuredFontSize = config.terminal.fontSize this.configuredLinePadding = config.terminal.linePadding this.setFontSize() @@ -417,11 +418,12 @@ export class XTermFrontend extends Frontend { return { ...searchOptions, decorations: { - matchOverviewRuler: '#cccc00', + matchOverviewRuler: '#888', activeMatchColorOverviewRuler: '#ffff00', - matchBorder: '#cc0', + matchBorder: '#888', + matchBackground: '#888', activeMatchBorder: '#ff0', - activeMatchBackground: 'rgba(255, 255, 0, 0.125)', + activeMatchBackground: '#ff0', }, } }