remove state generic from a lot of things
This commit is contained in:
@@ -5,24 +5,24 @@ pub struct Image {
|
||||
handle: TextureHandle,
|
||||
}
|
||||
|
||||
impl<State: 'static> Widget<State> for Image {
|
||||
fn draw(&mut self, painter: &mut Painter<State>) {
|
||||
impl Widget for Image {
|
||||
fn draw(&mut self, painter: &mut Painter) {
|
||||
painter.texture(&self.handle);
|
||||
}
|
||||
|
||||
fn desired_width(&mut self, _: &mut SizeCtx<State>) -> Len {
|
||||
fn desired_width(&mut self, _: &mut SizeCtx) -> Len {
|
||||
Len::abs(self.handle.size().x)
|
||||
}
|
||||
|
||||
fn desired_height(&mut self, _: &mut SizeCtx<State>) -> Len {
|
||||
fn desired_height(&mut self, _: &mut SizeCtx) -> Len {
|
||||
Len::abs(self.handle.size().y)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn image<State: 'static>(image: impl LoadableImage) -> impl WidgetFn<State, Image> {
|
||||
pub fn image<State: HasUi>(image: impl LoadableImage) -> impl WidgetFn<State, Image> {
|
||||
let image = image.get_image().expect("Failed to load image");
|
||||
move |ui| Image {
|
||||
handle: ui.add_texture(image),
|
||||
move |state| Image {
|
||||
handle: state.ui().add_texture(image),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user