Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-22 19:56:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #890 from mitchellh/faint-bg

Browse Source 
renderer: faint should not be applied to bg alpha
This commit is contained in:
Mitchell Hashimoto
2023-11-15 11:41:35 -08:00
committed by GitHub
parent 556900a747 ed3e3764d9
commit b5bf7e9d3b
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/renderer/Metal.zig
View File

@ -1345,22 +1345,24 @@ pub fn updateCell(
// in an attempt to make transparency look the best for various // in an attempt to make transparency look the best for various
// situations. See inline comments. // situations. See inline comments.
const bg_alpha: u8 = bg_alpha: { const bg_alpha: u8 = bg_alpha: {
if (self.config.background_opacity >= 1) break :bg_alpha alpha; const default: u8 = 255;
if (self.config.background_opacity >= 1) break :bg_alpha default;
// If we're selected, we do not apply background opacity // If we're selected, we do not apply background opacity
if (selected) break :bg_alpha alpha; if (selected) break :bg_alpha default;
// If we're reversed, do not apply background opacity // If we're reversed, do not apply background opacity
if (cell.attrs.inverse) break :bg_alpha alpha; if (cell.attrs.inverse) break :bg_alpha default;
// If we have a background and its not the default background // If we have a background and its not the default background
// then we apply background opacity // then we apply background opacity
if (cell.attrs.has_bg and !std.meta.eql(rgb, self.background_color)) { if (cell.attrs.has_bg and !std.meta.eql(rgb, self.background_color)) {
break :bg_alpha alpha; break :bg_alpha default;
} }
// We apply background opacity. // We apply background opacity.
var bg_alpha: f64 = @floatFromInt(alpha); var bg_alpha: f64 = @floatFromInt(default);
bg_alpha *= self.config.background_opacity; bg_alpha *= self.config.background_opacity;
bg_alpha = @ceil(bg_alpha); bg_alpha = @ceil(bg_alpha);
break :bg_alpha @intFromFloat(bg_alpha); break :bg_alpha @intFromFloat(bg_alpha);

12
src/renderer/OpenGL.zig
View File

@ -1138,22 +1138,24 @@ pub fn updateCell(
// in an attempt to make transparency look the best for various // in an attempt to make transparency look the best for various
// situations. See inline comments. // situations. See inline comments.
const bg_alpha: u8 = bg_alpha: { const bg_alpha: u8 = bg_alpha: {
if (self.config.background_opacity >= 1) break :bg_alpha alpha; const default: u8 = 255;
if (self.config.background_opacity >= 1) break :bg_alpha default;
// If we're selected, we do not apply background opacity // If we're selected, we do not apply background opacity
if (selected) break :bg_alpha alpha; if (selected) break :bg_alpha default;
// If we're reversed, do not apply background opacity // If we're reversed, do not apply background opacity
if (cell.attrs.inverse) break :bg_alpha alpha; if (cell.attrs.inverse) break :bg_alpha default;
// If we have a background and its not the default background // If we have a background and its not the default background
// then we apply background opacity // then we apply background opacity
if (cell.attrs.has_bg and !std.meta.eql(rgb, self.background_color)) { if (cell.attrs.has_bg and !std.meta.eql(rgb, self.background_color)) {
break :bg_alpha alpha; break :bg_alpha default;
} }
// We apply background opacity. // We apply background opacity.
var bg_alpha: f64 = @floatFromInt(alpha); var bg_alpha: f64 = @floatFromInt(default);
bg_alpha *= self.config.background_opacity; bg_alpha *= self.config.background_opacity;
bg_alpha = @ceil(bg_alpha); bg_alpha = @ceil(bg_alpha);
break :bg_alpha @intFromFloat(bg_alpha); break :bg_alpha @intFromFloat(bg_alpha);