leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store text_box pixels in widget state

Browse source
This commit is contained in:
Jeremy Soller 2022-10-27 15:17:52 -06:00
parent 5d38951338
commit c90dc58fef
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
examples/editor-libcosmic/src/text_box.rs
View file

@ -48,7 +48,6 @@ impl StyleSheet for Theme {
pub struct TextBox<'a> { pub struct TextBox<'a> {
buffer: &'a Mutex<TextBuffer<'static>>, buffer: &'a Mutex<TextBuffer<'static>>,
cache: &'a Mutex<SwashCache<'static>>, cache: &'a Mutex<SwashCache<'static>>,
pixels_opt: Option<(u32, u32, Vec<u8>)>,
} }
impl<'a> TextBox<'a> { impl<'a> TextBox<'a> {
@ -56,7 +55,6 @@ impl<'a> TextBox<'a> {
Self { Self {
buffer, buffer,
cache, cache,
pixels_opt: None,
} }
} }
} }
@ -111,7 +109,7 @@ where
fn draw( fn draw(
&self, &self,
_tree: &widget::Tree, tree: &widget::Tree,
renderer: &mut Renderer, renderer: &mut Renderer,
theme: &Renderer::Theme, theme: &Renderer::Theme,
_style: &renderer::Style, _style: &renderer::Style,
@ -119,6 +117,8 @@ where
_cursor_position: Point, _cursor_position: Point,
_viewport: &Rectangle, _viewport: &Rectangle,
) { ) {
let state = tree.state.downcast_ref::<State>();
if let Some(background_color) = theme.appearance().background_color { if let Some(background_color) = theme.appearance().background_color {
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
@ -131,7 +131,7 @@ where
); );
} }
if let Some((w, h, pixels)) = &self.pixels_opt { if let Some((w, h, pixels)) = &state.pixels_opt {
let handle = image::Handle::from_pixels(*w, *h, pixels.clone()); let handle = image::Handle::from_pixels(*w, *h, pixels.clone());
image::Renderer::draw(renderer, handle, layout.bounds()); image::Renderer::draw(renderer, handle, layout.bounds());
} }
@ -251,8 +251,8 @@ where
if layout_w < 0 || layout_h < 0 { if layout_w < 0 || layout_h < 0 {
// Invalid size, clear pixels // Invalid size, clear pixels
self.pixels_opt = None; state.pixels_opt = None;
} else if buffer.redraw { } else if buffer.redraw || state.pixels_opt.is_none() {
// Redraw buffer to image // Redraw buffer to image
let instant = Instant::now(); let instant = Instant::now();
@ -309,7 +309,7 @@ where
} }
}); });
self.pixels_opt = Some((layout_w as u32, layout_h as u32, pixels)); state.pixels_opt = Some((layout_w as u32, layout_h as u32, pixels));
buffer.redraw = false; buffer.redraw = false;
@ -331,9 +331,10 @@ where
} }
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] #[derive(Debug, Clone, PartialEq, Eq, Default)]
pub struct State { pub struct State {
is_dragging: bool, is_dragging: bool,
pixels_opt: Option<(u32, u32, Vec<u8>)>,
} }
impl State { impl State {