preparation

src/layout/painter.rs

@@ -2,8 +2,8 @@ use std::ops::Range;
 
 use crate::{
     layout::{
-        Active, SensorMap, SizeCtx, TextAttrs, TextBuffer, TextData, TextOffset, TextureHandle,
-        Textures, UiRegion, Vec2, WidgetId, Widgets,
+        Active, Cursor, SensorMap, SizeCtx, TextAttrs, TextBuffer, TextData, TextOffset,
+        TextureHandle, Textures, UiRegion, Vec2, WidgetId, Widgets,
     },
     render::{Primitive, PrimitiveHandle, Primitives},
     util::{HashSet, Id},
@@ -251,14 +251,15 @@ impl<'a, 'c> Painter<'a, 'c> {
         buffer: &mut TextBuffer,
         content: &str,
         attrs: &TextAttrs,
+        cursor: &Cursor,
     ) -> (TextureHandle, TextOffset) {
         self.ctx
             .text
-            .draw(buffer, content, attrs, self.ctx.textures)
+            .draw(buffer, content, attrs, cursor, self.ctx.textures)
     }
 
-    pub fn region_size(&self) -> Vec2 {
-        self.region.in_size(self.ctx.screen_size)
+    pub fn region(&self) -> UiRegion {
+        self.region
     }
 
     pub fn size<W>(&mut self, id: &WidgetId<W>) -> Vec2 {