Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - Change default FocusPolicy to Pass #7161

Closed
wants to merge 3 commits into from
Closed

[Merged by Bors] - Change default FocusPolicy to Pass #7161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3afd3d7
change default for FocusPolicy to Pass
mockersf Jan 11, 2023
4e6a92d
button should block
mockersf Jan 11, 2023
13bc353
use set_if_neq
mockersf Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions crates/bevy_ui/src/focus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub enum FocusPolicy {
}

impl FocusPolicy {
const DEFAULT: Self = Self::Block;
const DEFAULT: Self = Self::Pass;
}

impl Default for FocusPolicy {
Expand Down Expand Up @@ -164,9 +164,7 @@ pub fn ui_focus_system(
// Reset their interaction to None to avoid strange stuck state
if let Some(mut interaction) = node.interaction {
// We cannot simply set the interaction to None, as that will trigger change detection repeatedly
if *interaction != Interaction::None {
*interaction = Interaction::None;
}
interaction.set_if_neq(Interaction::None);
}

return None;
Expand Down
40 changes: 21 additions & 19 deletions crates/bevy_ui/src/node_bundles.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ pub struct ImageBundle {
}

/// A UI node that is text
#[derive(Bundle, Clone, Debug)]
#[derive(Bundle, Clone, Debug, Default)]
pub struct TextBundle {
/// Describes the size of the node
pub node: Node,
Expand Down Expand Up @@ -160,25 +160,8 @@ impl TextBundle {
}
}

impl Default for TextBundle {
fn default() -> Self {
TextBundle {
focus_policy: FocusPolicy::Pass,
text: Default::default(),
node: Default::default(),
calculated_size: Default::default(),
style: Default::default(),
transform: Default::default(),
global_transform: Default::default(),
visibility: Default::default(),
computed_visibility: Default::default(),
z_index: Default::default(),
}
}
}

/// A UI node that is a button
#[derive(Bundle, Clone, Debug, Default)]
#[derive(Bundle, Clone, Debug)]
pub struct ButtonBundle {
/// Describes the size of the node
pub node: Node,
Expand Down Expand Up @@ -213,3 +196,22 @@ pub struct ButtonBundle {
/// Indicates the depth at which the node should appear in the UI
pub z_index: ZIndex,
}

impl Default for ButtonBundle {
fn default() -> Self {
Self {
focus_policy: FocusPolicy::Block,
node: Default::default(),
button: Default::default(),
style: Default::default(),
interaction: Default::default(),
background_color: Default::default(),
image: Default::default(),
transform: Default::default(),
global_transform: Default::default(),
visibility: Default::default(),
computed_visibility: Default::default(),
z_index: Default::default(),
}
}
}