leyoda/libcosmic-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Removed unnecessary quad draw calls.

Browse source
This commit is contained in:
Aadil127 2026-06-15 18:02:23 +05:30 • committed by Ashley Wulber
parent 4d36a2ee5f
commit a991d7bb43
1 changed files with 86 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

179
src/widget/progress_bar/linear.rs
View file

@ -198,50 +198,29 @@ where
let border_color = custom_style.border_color.unwrap_or(custom_style.bar_color); let border_color = custom_style.border_color.unwrap_or(custom_style.bar_color);
let radius = custom_style.border_radius; let radius = custom_style.border_radius;
let draw_quad = |renderer: &mut Renderer,
x: f32,
width: f32,
color: iced::Color,
border: iced::Border| {
renderer.fill_quad(
renderer::Quad {
bounds: Rectangle {
x: bounds.x + x,
y: bounds.y,
width,
height: bounds.height,
},
border,
snap: true,
..renderer::Quad::default()
},
color,
);
};
// determinate progress bar
if self.progress.is_some() { if self.progress.is_some() {
let mut draw_quad =
|start: f32, segment_width: f32, progress_width: f32, border: iced::Border| {
renderer.fill_quad(
renderer::Quad {
bounds: Rectangle {
x: bounds.x + start,
y: bounds.y,
width: segment_width,
height: bounds.height,
},
border,
snap: true,
..renderer::Quad::default()
},
custom_style.track_color,
);
renderer.with_layer(
Rectangle {
x: bounds.x + start,
y: bounds.y,
width: progress_width,
height: bounds.height,
},
|renderer| {
renderer.fill_quad(
renderer::Quad {
bounds: Rectangle {
x: bounds.x + start,
y: bounds.y,
width: segment_width,
height: bounds.height,
},
border,
snap: true,
..renderer::Quad::default()
},
custom_style.bar_color,
);
},
);
};
let current_p = state.progress.current; let current_p = state.progress.current;
let len = self.markers.len(); let len = self.markers.len();
let spacing = self.segment_spacing; let spacing = self.segment_spacing;
@ -270,18 +249,64 @@ where
let segment_radius = [r_left, r_right, r_right, r_left].into(); let segment_radius = [r_left, r_right, r_right, r_left].into();
let fill = ((current_p - seg_lo) / (seg_hi - seg_lo)).min(1.0); let fill = ((current_p - seg_lo) / (seg_hi - seg_lo)).min(1.0);
draw_quad( let border = iced::Border {
x_start * bounds.width, width: border_width,
x_width * bounds.width, color: border_color,
x_width * fill * bounds.width, radius: segment_radius,
iced::Border { };
width: border_width,
color: border_color, // empty segment
radius: segment_radius, if current_p < seg_lo {
}, draw_quad(
); renderer,
x_start * bounds.width,
x_width * bounds.width,
custom_style.track_color,
border,
);
}
// filled segment
else if current_p > seg_hi {
draw_quad(
renderer,
x_start * bounds.width,
x_width * bounds.width,
custom_style.bar_color,
border,
);
}
// partially filled segment
else {
draw_quad(
renderer,
x_start * bounds.width,
x_width * bounds.width,
custom_style.track_color,
border,
);
renderer.with_layer(
Rectangle {
x: bounds.x + x_start * bounds.width,
y: bounds.y,
width: x_width * bounds.width * fill,
height: bounds.height,
},
|renderer| {
draw_quad(
renderer,
x_start * bounds.width,
x_width * bounds.width,
custom_style.bar_color,
border,
);
},
);
}
} }
} else { }
// indeterminate progress bar
else {
let (bar_start, bar_end) = let (bar_start, bar_end) =
state state
.animation .animation
@ -296,18 +321,12 @@ where
radius: radius.into(), radius: radius.into(),
}; };
renderer.fill_quad( draw_quad(
renderer::Quad { renderer,
bounds: Rectangle { 0.0,
x: bounds.x, bounds.width,
y: bounds.y,
width: bounds.width,
height: bounds.height,
},
border,
..renderer::Quad::default()
},
custom_style.track_color, custom_style.track_color,
border,
); );
renderer.with_layer( renderer.with_layer(
@ -318,20 +337,7 @@ where
height: bounds.height, height: bounds.height,
}, },
|renderer| { |renderer| {
renderer.fill_quad( draw_quad(renderer, 0.0, bounds.width, custom_style.bar_color, border);
renderer::Quad {
bounds: Rectangle {
x: bounds.x,
y: bounds.y,
width: bounds.width,
height: bounds.height,
},
border,
snap: true,
..renderer::Quad::default()
},
custom_style.bar_color,
);
}, },
); );
@ -343,20 +349,7 @@ where
height: bounds.height, height: bounds.height,
}, },
|renderer| { |renderer| {
renderer.fill_quad( draw_quad(renderer, 0.0, bounds.width, custom_style.bar_color, border);
renderer::Quad {
bounds: Rectangle {
x: bounds.x,
y: bounds.y,
width: bounds.width,
height: bounds.height,
},
border,
snap: true,
..renderer::Quad::default()
},
custom_style.bar_color,
);
}, },
); );
} }