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

gpui2: redundant_locals

Browse source
This commit is contained in:
Piotr Osiewicz 2024-01-02 12:59:40 +01:00
parent bcff7a8631
commit 945dba8099
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/gpui2/src/elements/div.rs
View file

@ -176,10 +176,12 @@ impl Interactivity {
{ {
self.mouse_move_listeners self.mouse_move_listeners
.push(Box::new(move |event, bounds, phase, cx| { .push(Box::new(move |event, bounds, phase, cx| {
if phase == DispatchPhase::Capture && cx if phase == DispatchPhase::Capture
&& cx
.active_drag .active_drag
.as_ref() .as_ref()
.is_some_and(|drag| drag.value.as_ref().type_id() == TypeId::of::<T>()) { .is_some_and(|drag| drag.value.as_ref().type_id() == TypeId::of::<T>())
{
(listener)( (listener)(
&DragMoveEvent { &DragMoveEvent {
event: event.clone(), event: event.clone(),
@ -1020,7 +1022,6 @@ impl Interactivity {
{ {
let command_held = cx.modifiers().command; let command_held = cx.modifiers().command;
cx.on_key_event({ cx.on_key_event({
let text_bounds = text_bounds;
move |e: &crate::ModifiersChangedEvent, _phase, cx| { move |e: &crate::ModifiersChangedEvent, _phase, cx| {
if e.modifiers.command != command_held if e.modifiers.command != command_held
&& text_bounds.contains(&cx.mouse_position()) && text_bounds.contains(&cx.mouse_position())
@ -1033,7 +1034,9 @@ impl Interactivity {
let hovered = bounds.contains(&cx.mouse_position()); let hovered = bounds.contains(&cx.mouse_position());
cx.on_mouse_event( cx.on_mouse_event(
move |event: &MouseMoveEvent, phase, cx| { move |event: &MouseMoveEvent, phase, cx| {
if phase == DispatchPhase::Capture && bounds.contains(&event.position) != hovered { if phase == DispatchPhase::Capture
&& bounds.contains(&event.position) != hovered
{
cx.notify(); cx.notify();
} }
}, },
@ -1041,7 +1044,6 @@ impl Interactivity {
cx.on_mouse_event({ cx.on_mouse_event({
let location = self.location.unwrap(); let location = self.location.unwrap();
let text_bounds = text_bounds;
move |e: &crate::MouseDownEvent, phase, cx| { move |e: &crate::MouseDownEvent, phase, cx| {
if text_bounds.contains(&e.position) if text_bounds.contains(&e.position)
&& phase.capture() && phase.capture()
@ -1182,7 +1184,9 @@ impl Interactivity {
if let Some(group_bounds) = hover_group_bounds { if let Some(group_bounds) = hover_group_bounds {
let hovered = group_bounds.contains(&cx.mouse_position()); let hovered = group_bounds.contains(&cx.mouse_position());
cx.on_mouse_event(move |event: &MouseMoveEvent, phase, cx| { cx.on_mouse_event(move |event: &MouseMoveEvent, phase, cx| {
if phase == DispatchPhase::Capture && group_bounds.contains(&event.position) != hovered { if phase == DispatchPhase::Capture
&& group_bounds.contains(&event.position) != hovered
{
cx.notify(); cx.notify();
} }
}); });
@ -1195,7 +1199,9 @@ impl Interactivity {
let bounds = bounds.intersect(&cx.content_mask().bounds); let bounds = bounds.intersect(&cx.content_mask().bounds);
let hovered = bounds.contains(&cx.mouse_position()); let hovered = bounds.contains(&cx.mouse_position());
cx.on_mouse_event(move |event: &MouseMoveEvent, phase, cx| { cx.on_mouse_event(move |event: &MouseMoveEvent, phase, cx| {
if phase == DispatchPhase::Capture && bounds.contains(&event.position) != hovered { if phase == DispatchPhase::Capture
&& bounds.contains(&event.position) != hovered
{
cx.notify(); cx.notify();
} }
}); });

1
crates/gpui2/src/elements/text.rs
View file

@ -171,7 +171,6 @@ impl TextState {
let line_height = text_style let line_height = text_style
.line_height .line_height
.to_pixels(font_size.into(), cx.rem_size()); .to_pixels(font_size.into(), cx.rem_size());
let text = text;
let runs = if let Some(runs) = runs { let runs = if let Some(runs) = runs {
runs runs