Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add supporting infrastructure to handle `overflow: scroll`. #263

Merged
merged 1 commit into from Apr 19, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Add supporting infrastructure to handle `overflow: scroll`.

  • Loading branch information
pcwalton committed Apr 19, 2016
commit 61f2b6e4ec684f41863ffed5c78513ffbe2b8033
@@ -981,9 +981,15 @@ impl Frame {
}
(ScrollPolicy::Scrollable, Some(scroll_layer_id)) => {
debug_assert!(!self.layers.contains_key(&scroll_layer_id));
let viewport_size = match scroll_layer_id.info {
ScrollLayerInfo::Scrollable(index) if index > 0 => {
stacking_context.bounds.size
}
_ => parent_info.viewport_size,
};
let layer = Layer::new(parent_info.offset_from_origin,
stacking_context.overflow.size,
parent_info.viewport_size,
viewport_size,
transform);
if parent_info.actual_scroll_layer_id != scroll_layer_id {
self.layers.get_mut(&parent_info.actual_scroll_layer_id).unwrap().add_child(scroll_layer_id);
@@ -994,6 +1000,8 @@ impl Frame {
info.offset_from_current_layer = Point2D::zero();
info.transform = Matrix4::identity();
info.perspective = Matrix4::identity();
info.current_clip_rect = Rect::new(Point2D::zero(),
stacking_context.overflow.size);
}
(ScrollPolicy::Scrollable, None) => {
// Nothing to do - use defaults as set above.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.