first pass of merging in warp (doesn't build)

crates/editor/src/render/element/text_block.rs

@@ -1,9 +1,8 @@
-use crate::{
-    extract_block,
-    render::model::{BlockItem, RenderState, viewport::ViewportItem},
-};
-
-use super::{RenderableBlock, paint::RenderContext};
+use super::RenderableBlock;
+use super::paint::RenderContext;
+use crate::extract_block;
+use crate::render::model::viewport::ViewportItem;
+use crate::render::model::{BlockItem, RenderState};
 
 pub struct RenderableTextBlock {
     viewport_item: ViewportItem,
@@ -23,12 +22,17 @@ impl RenderableBlock for RenderableTextBlock {
     fn layout(
         &mut self,
         _model: &RenderState,
-        _ctx: &mut galaxyui::LayoutContext,
-        _app: &galaxyui::AppContext,
+        _ctx: &mut galaxyui_core::LayoutContext,
+        _app: &galaxyui_core::AppContext,
     ) {
     }
 
-    fn paint(&mut self, model: &RenderState, ctx: &mut RenderContext, _app: &galaxyui::AppContext) {
+    fn paint(
+        &mut self,
+        model: &RenderState,
+        ctx: &mut RenderContext,
+        _app: &galaxyui_core::AppContext,
+    ) {
         let content = model.content();
         let text_block = extract_block!(
             self.viewport_item,