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

debugger_ui: Show zoom buttons only when the pane is hovered (#29543)

Browse source 
Closes #ISSUE

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2025-04-28 17:36:54 +02:00 • committed by GitHub
parent bf9e5b4f76
commit 4dc0551105
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 51 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

76
crates/debugger_ui/src/session/running.rs
View file

@ -32,7 +32,7 @@ use ui::{
ActiveTheme, AnyElement, App, ButtonCommon as _, Clickable as _, Context, ContextMenu, ActiveTheme, AnyElement, App, ButtonCommon as _, Clickable as _, Context, ContextMenu,
DropdownMenu, FluentBuilder, IconButton, IconName, IconSize, InteractiveElement, IntoElement, DropdownMenu, FluentBuilder, IconButton, IconName, IconSize, InteractiveElement, IntoElement,
Label, LabelCommon as _, ParentElement, Render, SharedString, StatefulInteractiveElement, Label, LabelCommon as _, ParentElement, Render, SharedString, StatefulInteractiveElement,
Styled, Tab, Tooltip, Window, div, h_flex, v_flex, Styled, Tab, Tooltip, VisibleOnHover, Window, div, h_flex, v_flex,
}; };
use util::ResultExt; use util::ResultExt;
use variable_list::VariableList; use variable_list::VariableList;
@ -106,6 +106,7 @@ pub(crate) struct SubView {
pane_focus_handle: FocusHandle, pane_focus_handle: FocusHandle,
kind: DebuggerPaneItem, kind: DebuggerPaneItem,
show_indicator: Box<dyn Fn(&App) -> bool>, show_indicator: Box<dyn Fn(&App) -> bool>,
hovered: bool,
} }
impl SubView { impl SubView {
@ -121,6 +122,7 @@ impl SubView {
inner: view, inner: view,
pane_focus_handle, pane_focus_handle,
show_indicator: show_indicator.unwrap_or(Box::new(|_| false)), show_indicator: show_indicator.unwrap_or(Box::new(|_| false)),
hovered: false,
}) })
} }
@ -170,6 +172,14 @@ impl Item for SubView {
impl Render for SubView { impl Render for SubView {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement { fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
v_flex() v_flex()
.id(SharedString::from(format!(
"subview-container-{}",
self.kind.to_shared_string()
)))
.on_hover(cx.listener(|this, hovered, _, cx| {
this.hovered = *hovered;
cx.notify();
}))
.size_full() .size_full()
// Add border uncoditionally to prevent layout shifts on focus changes. // Add border uncoditionally to prevent layout shifts on focus changes.
.border_1() .border_1()
@ -312,7 +322,14 @@ pub(crate) fn new_debugger_pane(
pane.set_render_tab_bar(cx, { pane.set_render_tab_bar(cx, {
move |pane, window, cx| { move |pane, window, cx| {
let active_pane_item = pane.active_item(); let active_pane_item = pane.active_item();
let pane_group_id: SharedString =
format!("pane-zoom-button-hover-{}", cx.entity_id()).into();
let is_hovered = active_pane_item.as_ref().map_or(false, |item| {
item.downcast::<SubView>()
.map_or(false, |this| this.read(cx).hovered)
});
h_flex() h_flex()
.group(pane_group_id.clone())
.justify_between() .justify_between()
.bg(cx.theme().colors().tab_bar_background) .bg(cx.theme().colors().tab_bar_background)
.border_b_1() .border_b_1()
@ -397,31 +414,40 @@ pub(crate) fn new_debugger_pane(
) )
.child({ .child({
let zoomed = pane.is_zoomed(); let zoomed = pane.is_zoomed();
IconButton::new( div()
"debug-toggle-zoom", .visible_on_hover(pane_group_id)
if zoomed { .when(is_hovered, |this| this.visible())
IconName::Minimize .child(
} else { IconButton::new(
IconName::Maximize SharedString::from(format!(
}, "debug-toggle-zoom-{}",
) cx.entity_id()
.icon_size(IconSize::XSmall) )),
.on_click(cx.listener(move |pane, _, window, cx| { if zoomed {
pane.toggle_zoom(&workspace::ToggleZoom, window, cx); IconName::Minimize
})) } else {
.tooltip({ IconName::Maximize
let focus_handle = focus_handle.clone(); },
move |window, cx| {
let zoomed_text = if zoomed { "Zoom Out" } else { "Zoom In" };
Tooltip::for_action_in(
zoomed_text,
&workspace::ToggleZoom,
&focus_handle,
window,
cx,
) )
} .icon_size(IconSize::XSmall)
}) .on_click(cx.listener(move |pane, _, window, cx| {
pane.toggle_zoom(&workspace::ToggleZoom, window, cx);
}))
.tooltip({
let focus_handle = focus_handle.clone();
move |window, cx| {
let zoomed_text =
if zoomed { "Zoom Out" } else { "Zoom In" };
Tooltip::for_action_in(
zoomed_text,
&workspace::ToggleZoom,
&focus_handle,
window,
cx,
)
}
}),
)
}) })
.into_any_element() .into_any_element()
} }