oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce a visible_bounds parameter to Element::paint

Browse Source 
We're not using this yet but this will be useful to avoid rendering
unnecessary portions of text.
This commit is contained in:
Antonio Scandurra
2021-09-02 11:42:23 +02:00
parent 38dc023942
commit 0490c609fb
21 changed files with 94 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gpui/src/elements/align.rs
+9 -4
View File
@@ -1,9 +1,10 @@
use crate::{
geometry::{rect::RectF, vector::Vector2F},
json, DebugContext, Element, ElementBox, Event, EventContext, LayoutContext, PaintContext,
SizeConstraint,
};
use json::ToJson;
use pathfinder_geometry::vector::Vector2F;
use serde_json::json;
pub struct Align {
@@ -53,7 +54,8 @@ impl Element for Align {
fn paint(
&mut self,
bounds: pathfinder_geometry::rect::RectF,
bounds: RectF,
visible_bounds: RectF,
_: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
@@ -63,8 +65,11 @@ impl Element for Align {
let child_center = self.child.size() / 2.;
let child_target = child_center + child_center * self.alignment;
self.child
.paint(bounds.origin() - (child_target - my_target), cx);
self.child.paint(
bounds.origin() - (child_target - my_target),
visible_bounds,
cx,
);
}
fn dispatch_event(
gpui/src/elements/canvas.rs
+5 -6
View File
@@ -9,13 +9,11 @@ use pathfinder_geometry::{
vector::{vec2f, Vector2F},
};
pub struct Canvas<F>(F)
where
F: FnMut(RectF, &mut PaintContext);
pub struct Canvas<F>(F);
impl<F> Canvas<F>
where
F: FnMut(RectF, &mut PaintContext),
F: FnMut(RectF, RectF, &mut PaintContext),
{
pub fn new(f: F) -> Self {
Self(f)
@@ -24,7 +22,7 @@ where
impl<F> Element for Canvas<F>
where
F: FnMut(RectF, &mut PaintContext),
F: FnMut(RectF, RectF, &mut PaintContext),
{
type LayoutState = ();
type PaintState = ();
@@ -50,10 +48,11 @@ where
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
_: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
self.0(bounds, cx)
self.0(bounds, visible_bounds, cx)
}
fn dispatch_event(
gpui/src/elements/constrained_box.rs
+2 -1
View File
@@ -70,10 +70,11 @@ impl Element for ConstrainedBox {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
_: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
self.child.paint(bounds.origin(), cx);
self.child.paint(bounds.origin(), visible_bounds, cx);
}
fn dispatch_event(
gpui/src/elements/container.rs
+2 -1
View File
@@ -169,6 +169,7 @@ impl Element for Container {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
_: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
@@ -198,7 +199,7 @@ impl Element for Container {
self.style.border.left_width(),
self.style.border.top_width(),
);
self.child.paint(child_origin, cx);
self.child.paint(child_origin, visible_bounds, cx);
}
fn dispatch_event(
gpui/src/elements/empty.rs
+1
View File
@@ -42,6 +42,7 @@ impl Element for Empty {
fn paint(
&mut self,
_: RectF,
_: RectF,
_: &mut Self::LayoutState,
_: &mut PaintContext,
) -> Self::PaintState {
gpui/src/elements/event_handler.rs
+2 -1
View File
@@ -44,10 +44,11 @@ impl Element for EventHandler {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
_: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
self.child.paint(bounds.origin(), cx);
self.child.paint(bounds.origin(), visible_bounds, cx);
}
fn dispatch_event(
gpui/src/elements/flex.rs
+4 -2
View File
@@ -134,12 +134,13 @@ impl Element for Flex {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
_: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
let mut child_origin = bounds.origin();
for child in &mut self.children {
child.paint(child_origin, cx);
child.paint(child_origin, visible_bounds, cx);
match self.axis {
Axis::Horizontal => child_origin += vec2f(child.size().x(), 0.0),
Axis::Vertical => child_origin += vec2f(0.0, child.size().y()),
@@ -212,10 +213,11 @@ impl Element for Expanded {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
_: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
self.child.paint(bounds.origin(), cx)
self.child.paint(bounds.origin(), visible_bounds, cx)
}
fn dispatch_event(
gpui/src/elements/label.rs
+1
View File
@@ -128,6 +128,7 @@ impl Element for Label {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
line: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
gpui/src/elements/line_box.rs
+8 -4
View File
@@ -48,18 +48,22 @@ impl Element for LineBox {
fn paint(
&mut self,
bounds: pathfinder_geometry::rect::RectF,
bounds: RectF,
visible_bounds: RectF,
padding_top: &mut f32,
cx: &mut PaintContext,
) -> Self::PaintState {
self.child
.paint(bounds.origin() + vec2f(0., *padding_top), cx);
self.child.paint(
bounds.origin() + vec2f(0., *padding_top),
visible_bounds,
cx,
);
}
fn dispatch_event(
&mut self,
event: &Event,
_: pathfinder_geometry::rect::RectF,
_: RectF,
_: &mut Self::LayoutState,
_: &mut Self::PaintState,
cx: &mut EventContext,
gpui/src/elements/list.rs
+9 -3
View File
@@ -230,12 +230,18 @@ impl Element for List {
(size, scroll_top)
}
fn paint(&mut self, bounds: RectF, scroll_top: &mut ListOffset, cx: &mut PaintContext) {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
scroll_top: &mut ListOffset,
cx: &mut PaintContext,
) {
cx.scene.push_layer(Some(bounds));
let state = &mut *self.state.0.borrow_mut();
for (mut element, origin) in state.visible_elements(bounds, scroll_top) {
element.paint(origin, cx);
element.paint(origin, visible_bounds, cx);
}
cx.scene.pop_layer();
@@ -832,7 +838,7 @@ mod tests {
(self.size, ())
}
fn paint(&mut self, _: RectF, _: &mut (), _: &mut PaintContext) {
fn paint(&mut self, _: RectF, _: RectF, _: &mut (), _: &mut PaintContext) {
todo!()
}
gpui/src/elements/mouse_event_handler.rs
+2 -1
View File
@@ -81,10 +81,11 @@ impl Element for MouseEventHandler {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
_: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
self.child.paint(bounds.origin(), cx);
self.child.paint(bounds.origin(), visible_bounds, cx);
}
fn dispatch_event(
gpui/src/elements/overlay.rs
+8 -2
View File
@@ -27,10 +27,16 @@ impl Element for Overlay {
(Vector2F::zero(), size)
}
fn paint(&mut self, bounds: RectF, size: &mut Self::LayoutState, cx: &mut PaintContext) {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
size: &mut Self::LayoutState,
cx: &mut PaintContext,
) {
let bounds = RectF::new(bounds.origin(), *size);
cx.scene.push_stacking_context(None);
self.child.paint(bounds.origin(), cx);
self.child.paint(bounds.origin(), visible_bounds, cx);
cx.scene.pop_stacking_context();
}
gpui/src/elements/stack.rs
+2 -1
View File
@@ -36,12 +36,13 @@ impl Element for Stack {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
_: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
for child in &mut self.children {
cx.scene.push_layer(None);
child.paint(bounds.origin(), cx);
child.paint(bounds.origin(), visible_bounds, cx);
cx.scene.pop_layer();
}
}
gpui/src/elements/svg.rs
+7 -1
View File
@@ -65,7 +65,13 @@ impl Element for Svg {
}
}
fn paint(&mut self, bounds: RectF, svg: &mut Self::LayoutState, cx: &mut PaintContext) {
fn paint(
&mut self,
bounds: RectF,
_visible_bounds: RectF,
svg: &mut Self::LayoutState,
cx: &mut PaintContext,
) {
if let Some(svg) = svg.clone() {
cx.scene.push_icon(scene::Icon {
bounds,
gpui/src/elements/text.rs
+1
View File
@@ -76,6 +76,7 @@ impl Element for Text {
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
layout: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
gpui/src/elements/uniform_list.rs
+2 -1
View File
@@ -165,6 +165,7 @@ where
fn paint(
&mut self,
bounds: RectF,
visible_bounds: RectF,
layout: &mut Self::LayoutState,
cx: &mut PaintContext,
) -> Self::PaintState {
@@ -174,7 +175,7 @@ where
bounds.origin() - vec2f(0.0, self.state.scroll_top() % layout.item_height);
for item in &mut layout.items {
item.paint(item_origin, cx);
item.paint(item_origin, visible_bounds, cx);
item_origin += vec2f(0.0, layout.item_height);
}