@@ -10,7 +10,7 @@ use bevy_sprite::{ImageScaleMode, TextureSlice};
10
10
use bevy_transform:: prelude:: * ;
11
11
use bevy_utils:: HashSet ;
12
12
13
- use crate :: { widget :: UiImageSize , BackgroundColor , CalculatedClip , ExtractedUiNode , Node , UiImage } ;
13
+ use crate :: { BackgroundColor , CalculatedClip , ExtractedUiNode , Node , UiImage } ;
14
14
15
15
/// Component storing texture slices for image nodes entities with a tiled or sliced [`ImageScaleMode`]
16
16
///
@@ -119,13 +119,7 @@ pub(crate) fn compute_slices_on_asset_event(
119
119
mut commands : Commands ,
120
120
mut events : EventReader < AssetEvent < Image > > ,
121
121
images : Res < Assets < Image > > ,
122
- ui_nodes : Query < (
123
- Entity ,
124
- & ImageScaleMode ,
125
- & Node ,
126
- Option < & UiImageSize > ,
127
- & UiImage ,
128
- ) > ,
122
+ ui_nodes : Query < ( Entity , & ImageScaleMode , & Node , & UiImage ) > ,
129
123
) {
130
124
// We store the asset ids of added/modified image assets
131
125
let added_handles: HashSet < _ > = events
@@ -139,12 +133,11 @@ pub(crate) fn compute_slices_on_asset_event(
139
133
return ;
140
134
}
141
135
// We recompute the sprite slices for sprite entities with a matching asset handle id
142
- for ( entity, scale_mode, ui_node, size , image) in & ui_nodes {
136
+ for ( entity, scale_mode, ui_node, image) in & ui_nodes {
143
137
if !added_handles. contains ( & image. texture . id ( ) ) {
144
138
continue ;
145
139
}
146
- let size = size. map ( |s| s. size ( ) ) . unwrap_or ( ui_node. size ( ) ) ;
147
- if let Some ( slices) = compute_texture_slices ( size, scale_mode, image, & images) {
140
+ if let Some ( slices) = compute_texture_slices ( ui_node. size ( ) , scale_mode, image, & images) {
148
141
commands. entity ( entity) . insert ( slices) ;
149
142
}
150
143
}
@@ -156,24 +149,12 @@ pub(crate) fn compute_slices_on_image_change(
156
149
mut commands : Commands ,
157
150
images : Res < Assets < Image > > ,
158
151
changed_nodes : Query <
159
- (
160
- Entity ,
161
- & ImageScaleMode ,
162
- & Node ,
163
- Option < & UiImageSize > ,
164
- & UiImage ,
165
- ) ,
166
- Or < (
167
- Changed < ImageScaleMode > ,
168
- Changed < UiImage > ,
169
- Changed < UiImageSize > ,
170
- Changed < Node > ,
171
- ) > ,
152
+ ( Entity , & ImageScaleMode , & Node , & UiImage ) ,
153
+ Or < ( Changed < ImageScaleMode > , Changed < UiImage > , Changed < Node > ) > ,
172
154
> ,
173
155
) {
174
- for ( entity, scale_mode, ui_node, size, image) in & changed_nodes {
175
- let size = size. map ( |s| s. size ( ) ) . unwrap_or ( ui_node. size ( ) ) ;
176
- if let Some ( slices) = compute_texture_slices ( size, scale_mode, image, & images) {
156
+ for ( entity, scale_mode, ui_node, image) in & changed_nodes {
157
+ if let Some ( slices) = compute_texture_slices ( ui_node. size ( ) , scale_mode, image, & images) {
177
158
commands. entity ( entity) . insert ( slices) ;
178
159
}
179
160
}
0 commit comments