Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-13 00:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename the background_color of 'ExtractedUiNode to color` (#7452)

Browse source 
# Problem
The field is called `background_color` but it is also used to hold the colors of text glyphs and images.
It's mildly confusing and longer to type than just `color`.

## Solution
Rename `background_color` to `color`.

## Changelog
* Renamed the `background_color` field of `ExtractedUiNode` to `color`.

## Migration Guide
* The `background_color` field of `ExtractedUiNode` is now named `color`.
This commit is contained in:
ickshonpe 2023-02-01 00:24:25 +00:00
parent 615d3d2157
commit f3b8ff6549
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/bevy_ui/src/render/mod.rs
View file

@ -169,7 +169,7 @@ fn get_ui_graph(render_app: &mut App) -> RenderGraph {
pub struct ExtractedUiNode { pub struct ExtractedUiNode {
pub stack_index: usize, pub stack_index: usize,
pub transform: Mat4, pub transform: Mat4,
pub background_color: Color, pub color: Color,
pub rect: Rect, pub rect: Rect,
pub image: Handle<Image>, pub image: Handle<Image>,
pub atlas_size: Option<Vec2>, pub atlas_size: Option<Vec2>,
@ -221,7 +221,7 @@ pub fn extract_uinodes(
extracted_uinodes.uinodes.push(ExtractedUiNode { extracted_uinodes.uinodes.push(ExtractedUiNode {
stack_index, stack_index,
transform: transform.compute_matrix(), transform: transform.compute_matrix(),
background_color: color.0, color: color.0,
rect: Rect { rect: Rect {
min: Vec2::ZERO, min: Vec2::ZERO,
max: uinode.calculated_size, max: uinode.calculated_size,
@ -357,7 +357,7 @@ pub fn extract_text_uinodes(
extracted_uinodes.uinodes.push(ExtractedUiNode { extracted_uinodes.uinodes.push(ExtractedUiNode {
stack_index, stack_index,
transform: extracted_transform, transform: extracted_transform,
background_color: color, color,
rect, rect,
image: texture, image: texture,
atlas_size, atlas_size,
@ -524,7 +524,7 @@ pub fn prepare_uinodes(
uvs = [uvs[3], uvs[2], uvs[1], uvs[0]]; uvs = [uvs[3], uvs[2], uvs[1], uvs[0]];
} }
let color = extracted_uinode.background_color.as_linear_rgba_f32(); let color = extracted_uinode.color.as_linear_rgba_f32();
for i in QUAD_INDICES { for i in QUAD_INDICES {
ui_meta.vertices.push(UiVertex { ui_meta.vertices.push(UiVertex {
position: positions_clipped[i].into(), position: positions_clipped[i].into(),