mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-24 09:18:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Always set the padding color to current window background

Browse Source
This commit is contained in:
Kovid Goyal
2018-02-16 11:55:33 +05:30
parent 2913c1aedc
commit f25ecedcab
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kitty/border_vertex.glsl
View File

@@ -12,6 +12,7 @@ const int LEFT = 0;
const int TOP = 1; const int TOP = 1;
const int RIGHT = 2; const int RIGHT = 2;
const int BOTTOM = 3; const int BOTTOM = 3;
const uint FF = uint(0xff);
const uvec2 pos_map[] = uvec2[4]( const uvec2 pos_map[] = uvec2[4](
uvec2(RIGHT, TOP), uvec2(RIGHT, TOP),
@@ -27,9 +28,14 @@ vec2 to_opengl(uint x, uint y) {
); );
} }
float to_color(uint c) {
return float(c & FF) / 255.0;
}
void main() { void main() {
uvec2 pos = pos_map[gl_VertexID]; uvec2 pos = pos_map[gl_VertexID];
gl_Position = vec4(to_opengl(rect[pos.x], rect[pos.y]), 0, 1); gl_Position = vec4(to_opengl(rect[pos.x], rect[pos.y]), 0, 1);
int rc = int(rect_color); int rc = int(rect_color);
color = float(1 & rc) * default_bg + float((2 & rc) >> 1) * active_border_color + float((4 & rc) >> 2) * inactive_border_color; vec3 window_bg = vec3(to_color(rect_color >> 24), to_color(rect_color >> 16), to_color(rect_color >> 8));
color = float(1 & rc) * default_bg + float((2 & rc) >> 1) * active_border_color + float((4 & rc) >> 2) * inactive_border_color + float((8 & rc) >> 3) * window_bg;
} }

3
kitty/borders.py
View File

@@ -72,8 +72,9 @@ class Borders:
) )
if pw > 0: if pw > 0:
# Draw the background rectangles over the padding region # Draw the background rectangles over the padding region
color = w.screen.color_profile.default_bg
border( border(
self.os_window_id, self.tab_id, self.os_window_id, self.tab_id,
1, pw, g.left - pw, g.top - pw, g.right + pw, (color << 8) | 8, pw, g.left - pw, g.top - pw, g.right + pw,
g.bottom + pw g.bottom + pw
) )