Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Render borders correctly when only a subset of the border is visible

Browse source
This commit is contained in:
Antonio Scandurra 2021-03-31 13:30:07 +02:00
parent 073ff96a9f
commit d853dbb048
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gpui/src/platform/mac/shaders/shaders.metal
View file

@ -81,11 +81,17 @@ fragment float4 quad_fragment(
float2 rounded_edge_to_point = abs(center_to_point) - half_size + input.corner_radius; float2 rounded_edge_to_point = abs(center_to_point) - half_size + input.corner_radius;
float distance = length(max(0., rounded_edge_to_point)) + min(0., max(rounded_edge_to_point.x, rounded_edge_to_point.y)) - input.corner_radius; float distance = length(max(0., rounded_edge_to_point)) + min(0., max(rounded_edge_to_point.x, rounded_edge_to_point.y)) - input.corner_radius;
float border_width = 0.; float vertical_border = center_to_point.x <= 0. ? input.border_left : input.border_right;
if (edge_to_point.x > edge_to_point.y) { float horizontal_border = center_to_point.y <= 0. ? input.border_top : input.border_bottom;
border_width = center_to_point.x <= 0. ? input.border_left : input.border_right; float2 inset_size = half_size - input.corner_radius - float2(vertical_border, horizontal_border);
float2 point_to_inset_corner = abs(center_to_point) - inset_size;
float border_width;
if (point_to_inset_corner.x < 0. && point_to_inset_corner.y < 0.) {
border_width = 0.;
} else if (point_to_inset_corner.y > point_to_inset_corner.x) {
border_width = horizontal_border;
} else { } else {
border_width = center_to_point.y <= 0. ? input.border_top : input.border_bottom; border_width = vertical_border;
} }
float4 color; float4 color;

2
zed/src/workspace/pane.rs
View file

@ -173,7 +173,7 @@ impl Pane {
ctx.emit(Event::Split(direction)); ctx.emit(Event::Split(direction));
} }
fn render_tabs<'a>(&self, app: &AppContext) -> ElementBox { fn render_tabs(&self, app: &AppContext) -> ElementBox {
let settings = smol::block_on(self.settings.read()); let settings = smol::block_on(self.settings.read());
let border_color = ColorU::from_u32(0xdbdbdcff); let border_color = ColorU::from_u32(0xdbdbdcff);