zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-18 18:08:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

project panel: Do not display scrollbar when entries do not overflow the panel (#13422)

Browse Source 
/cc @JunkuiZhang 

Fixes
https://github.com/zed-industries/zed/pull/13358#issuecomment-2185032031

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-06-23 18:24:21 +02:00 committed by GitHub
parent d272e402ea
commit 89739d5874
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/project_panel/src/project_panel.rs
View File

@ -2233,8 +2233,7 @@ impl ProjectPanel {
let total_list_length = height.0 as f64 * items_count as f64;
let current_offset = scroll_handle.base_handle.offset().y.0.min(0.).abs() as f64;
let mut percentage = current_offset / total_list_length;
let mut end_offset = (current_offset
+ scroll_handle.base_handle.bounds().size.height.0 as f64)
let end_offset = (current_offset + scroll_handle.base_handle.bounds().size.height.0 as f64)
/ total_list_length;
// Uniform scroll handle might briefly report an offset greater than the length of a list;
// in such case we'll adjust the starting offset as well to keep the scrollbar thumb length stable.
@ -2242,14 +2241,15 @@ impl ProjectPanel {
if overshoot > 0. {
percentage -= overshoot;
}
if percentage + 0.005 > 1.0 || end_offset > total_list_length {
const MINIMUM_SCROLLBAR_PERCENTAGE_HEIGHT: f64 = 0.005;
if percentage + MINIMUM_SCROLLBAR_PERCENTAGE_HEIGHT > 1.0 || end_offset > total_list_length
{
return None;
}
if total_list_length < scroll_handle.base_handle.bounds().size.height.0 as f64 {
percentage = 0.;
end_offset = 1.;
return None;
}
let end_offset = end_offset.clamp(percentage + 0.005, 1.);
let end_offset = end_offset.clamp(percentage + MINIMUM_SCROLLBAR_PERCENTAGE_HEIGHT, 1.);
Some(
div()
.occlude()