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

Revert unintended renaming (#25318)

Browse source 
Just little bit clean up from #25288

Release Notes:

- N/A
This commit is contained in:
smit 2025-02-21 18:44:23 +05:30 • committed by GitHub
parent dff47a8436
commit c9235ff916
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 151 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/ui/src/components/scrollbar.rs
View file

@ -224,17 +224,13 @@ impl Element for Scrollbar {
fn paint( fn paint(
&mut self, &mut self,
_id: Option<&GlobalElementId>, _id: Option<&GlobalElementId>,
padded_bounds: Bounds<Pixels>, bounds: Bounds<Pixels>,
_request_layout: &mut Self::RequestLayoutState, _request_layout: &mut Self::RequestLayoutState,
_prepaint: &mut Self::PrepaintState, _prepaint: &mut Self::PrepaintState,
window: &mut Window, window: &mut Window,
cx: &mut App, cx: &mut App,
) { ) {
window.with_content_mask( window.with_content_mask(Some(ContentMask { bounds }), |window| {
Some(ContentMask {
bounds: padded_bounds,
}),
|window| {
let colors = cx.theme().colors(); let colors = cx.theme().colors();
let thumb_background = colors let thumb_background = colors
.surface_background .surface_background
@ -243,13 +239,13 @@ impl Element for Scrollbar {
let extra_padding = px(5.0); let extra_padding = px(5.0);
let padded_bounds = if is_vertical { let padded_bounds = if is_vertical {
Bounds::from_corners( Bounds::from_corners(
padded_bounds.origin + point(Pixels::ZERO, extra_padding), bounds.origin + point(Pixels::ZERO, extra_padding),
padded_bounds.bottom_right() - point(Pixels::ZERO, extra_padding * 3), bounds.bottom_right() - point(Pixels::ZERO, extra_padding * 3),
) )
} else { } else {
Bounds::from_corners( Bounds::from_corners(
padded_bounds.origin + point(extra_padding, Pixels::ZERO), bounds.origin + point(extra_padding, Pixels::ZERO),
padded_bounds.bottom_right() - point(extra_padding * 3, Pixels::ZERO), bounds.bottom_right() - point(extra_padding * 3, Pixels::ZERO),
) )
}; };
@ -300,13 +296,12 @@ impl Element for Scrollbar {
let scroll = scroll.clone(); let scroll = scroll.clone();
let state = self.state.clone(); let state = self.state.clone();
move |event: &MouseDownEvent, phase, _, _| { move |event: &MouseDownEvent, phase, _, _| {
if !(phase.bubble() && padded_bounds.contains(&event.position)) { if !(phase.bubble() && bounds.contains(&event.position)) {
return; return;
} }
if thumb_bounds.contains(&event.position) { if thumb_bounds.contains(&event.position) {
let offset = let offset = event.position.along(axis) - thumb_bounds.origin.along(axis);
event.position.along(axis) - thumb_bounds.origin.along(axis);
state.drag.set(Some(offset)); state.drag.set(Some(offset));
} else if let Some(ContentSize { } else if let Some(ContentSize {
size: item_size, .. size: item_size, ..
@ -321,8 +316,7 @@ impl Element for Scrollbar {
- (thumb_size / 2.)) - (thumb_size / 2.))
.clamp(px(0.), viewport_size - thumb_size); .clamp(px(0.), viewport_size - thumb_size);
let max_offset = let max_offset = (item_size.along(axis) - viewport_size).max(px(0.));
(item_size.along(axis) - viewport_size).max(px(0.));
let percentage = if viewport_size > thumb_size { let percentage = if viewport_size > thumb_size {
thumb_start / (viewport_size - thumb_size) thumb_start / (viewport_size - thumb_size)
} else { } else {
@ -345,7 +339,7 @@ impl Element for Scrollbar {
window.on_mouse_event({ window.on_mouse_event({
let scroll = scroll.clone(); let scroll = scroll.clone();
move |event: &ScrollWheelEvent, phase, window, _| { move |event: &ScrollWheelEvent, phase, window, _| {
if phase.bubble() && padded_bounds.contains(&event.position) { if phase.bubble() && bounds.contains(&event.position) {
let current_offset = scroll.offset(); let current_offset = scroll.offset();
scroll.set_offset( scroll.set_offset(
current_offset + event.delta.pixel_delta(window.line_height()), current_offset + event.delta.pixel_delta(window.line_height()),
@ -370,8 +364,7 @@ impl Element for Scrollbar {
- drag_state) - drag_state)
.clamp(px(0.), viewport_size - thumb_size); .clamp(px(0.), viewport_size - thumb_size);
let max_offset = let max_offset = (item_size.along(axis) - viewport_size).max(px(0.));
(item_size.along(axis) - viewport_size).max(px(0.));
let percentage = if viewport_size > thumb_size { let percentage = if viewport_size > thumb_size {
thumb_start / (viewport_size - thumb_size) thumb_start / (viewport_size - thumb_size)
} else { } else {
@ -405,8 +398,7 @@ impl Element for Scrollbar {
} }
} }
}); });
}, })
)
} }
} }