a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-29 01:13:53 +03:00
Code Issues Projects Releases Wiki Activity

Fix scrollbar dragging, which was broken because the Slider gets

Browse Source 
recreated while we drag.

But there's still something wrong, because in the OSM viewer with a huge
list of buttons, scrolling is incredibly laggy while dragging, but not
when using the scroll wheel.
This commit is contained in:
Dustin Carlino 2020-10-28 13:56:08 -07:00
parent 37896c9d37
commit 304e723d77
2 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
widgetry/src/widgets/panel.rs
View File

@ -61,6 +61,8 @@ impl Panel {
let old_scrollable_x = self.scrollable_x;
let old_scrollable_y = self.scrollable_y;
let old_scroll_offset = self.scroll_offset();
let mut was_dragging_x = false;
let mut was_dragging_y = false;
self.scrollable_x = self.contents_dims.width > self.container_dims.width;
self.scrollable_y = self.contents_dims.height > self.container_dims.height;
@ -68,11 +70,21 @@ impl Panel {
// Unwrap the main widget from any scrollable containers if necessary.
if old_scrollable_y {
let container = self.top_level.widget.downcast_mut::<Container>().unwrap();
was_dragging_y = container.members[1]
.widget
.downcast_ref::<Slider>()
.unwrap()
.dragging;
self.top_level = container.members.remove(0);
}
if old_scrollable_x {
let container = self.top_level.widget.downcast_mut::<Container>().unwrap();
was_dragging_x = container.members[1]
.widget
.downcast_ref::<Slider>()
.unwrap()
.dragging;
self.top_level = container.members.remove(0);
}
@ -82,35 +94,40 @@ impl Panel {
// Wrap the main widget in scrollable containers if necessary.
if self.scrollable_x {
let mut slider = Slider::horizontal(
ctx,
self.container_dims.width,
self.container_dims.width * (self.container_dims.width / self.contents_dims.width),
0.0,
)
.named("horiz scrollbar")
.abs(top_left.x, top_left.y + self.container_dims.height);
// We constantly destroy and recreate the scrollbar slider while dragging it. Preserve
// the dragging property, so we can keep dragging it.
if was_dragging_x {
slider.widget.downcast_mut::<Slider>().unwrap().dragging = true;
}
let old_top_level = std::mem::replace(&mut self.top_level, Widget::nothing());
self.top_level = Widget::custom_col(vec![
old_top_level,
Slider::horizontal(
ctx,
self.container_dims.width,
self.container_dims.width
* (self.container_dims.width / self.contents_dims.width),
0.0,
)
.named("horiz scrollbar")
.abs(top_left.x, top_left.y + self.container_dims.height),
]);
self.top_level = Widget::custom_col(vec![old_top_level, slider]);
}
if self.scrollable_y {
let mut slider = Slider::vertical(
ctx,
self.container_dims.height,
self.container_dims.height
* (self.container_dims.height / self.contents_dims.height),
0.0,
)
.named("vert scrollbar")
.abs(top_left.x + self.container_dims.width, top_left.y);
if was_dragging_y {
slider.widget.downcast_mut::<Slider>().unwrap().dragging = true;
}
let old_top_level = std::mem::replace(&mut self.top_level, Widget::nothing());
self.top_level = Widget::custom_row(vec![
old_top_level,
Slider::vertical(
ctx,
self.container_dims.height,
self.container_dims.height
* (self.container_dims.height / self.contents_dims.height),
0.0,
)
.named("vert scrollbar")
.abs(top_left.x + self.container_dims.width, top_left.y),
]);
self.top_level = Widget::custom_row(vec![old_top_level, slider]);
}
self.update_scroll_sliders(ctx, old_scroll_offset);

4
widgetry/src/widgets/slider.rs
View File

@ -8,7 +8,7 @@ use crate::{
pub struct Slider {
current_percent: f64,
mouse_on_slider: bool,
dragging: bool,
pub(crate) dragging: bool,
style: Style,
@ -188,8 +188,6 @@ impl Slider {
assert!(percent >= 0.0 && percent <= 1.0);
self.current_percent = percent;
self.recalc(ctx);
// Just reset dragging, to prevent chaos
self.dragging = false;
if let Some(pt) = ctx.canvas.get_cursor_in_screen_space() {
self.mouse_on_slider = self
.slider_geom()