From 811c8ea2d181441bb5e39f32e536d7f676718384 Mon Sep 17 00:00:00 2001 From: keith Date: Fri, 4 Sep 2020 11:06:31 -0700 Subject: [PATCH] minor changes --- src/editor/mod.rs | 9 +++++++-- src/renderer/mod.rs | 32 +++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/src/editor/mod.rs b/src/editor/mod.rs index 7c3ef56..47139e8 100644 --- a/src/editor/mod.rs +++ b/src/editor/mod.rs @@ -31,6 +31,7 @@ pub struct WindowRenderInfo { pub grid_position: (f64, f64), pub width: u64, pub height: u64, + pub floating: bool, pub draw_commands: Vec } @@ -242,16 +243,19 @@ impl Editor { } fn set_message_position(&mut self, grid: u64, row: u64) { + let parent_width = self.windows.get(&1).map(|parent| parent.grid.width).unwrap_or(1); + if let Some(window) = self.windows.get_mut(&grid) { window.hidden = false; window.anchor_grid_id = Some(1); window.anchor_type = WindowAnchor::NorthWest; window.anchor_row = row as f64; window.anchor_column = 0.0; - } else if let Some(parent) = self.windows.get(&1) { + window.resize(parent_width, window.grid.height); + } else { let new_window = Window::new( grid, - parent.grid.width, + parent_width, 1, None, WindowAnchor::NorthWest, @@ -337,6 +341,7 @@ impl Editor { grid_position, width, height, + floating: window.anchor_grid_id.is_some(), draw_commands }) } diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs index 61969f1..bd214a5 100644 --- a/src/renderer/mod.rs +++ b/src/renderer/mod.rs @@ -4,9 +4,11 @@ use std::sync::Arc; use log::trace; use skulpin::skia_safe::gpu::SurfaceOrigin; use skulpin::skia_safe::{ - colors, dash_path_effect, Budgeted, Canvas, ImageInfo, Paint, Rect, Surface, Point + colors, dash_path_effect, Budgeted, Canvas, ImageInfo, Paint, Rect, Surface, Point, BlendMode, image_filters::blur +}; +use skulpin::skia_safe::canvas::{ + SrcRectConstraint, SaveLayerRec }; -use skulpin::skia_safe::canvas::SrcRectConstraint; use skulpin::CoordinateSystemHelper; mod caching_shaper; @@ -155,12 +157,20 @@ impl Renderer { cell_width: u64, style: &Option>, default_style: &Arc