From 1c929dc0ddc8773ce7c2d3e50f56f939fbe904e1 Mon Sep 17 00:00:00 2001
From: sam edelsten <samedelsten1@gmail.com>
Date: Fri, 4 Aug 2023 23:20:16 +0100
Subject: [PATCH] fix broken multistyle text
---
TODO | 7 +++++--
src/lib.rs | 14 ++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/TODO b/TODO
index e386cf1..a20607d 100644
--- a/TODO
+++ b/TODO
@@ -3,8 +3,6 @@
BUGS INTRODUCED:
-[ ] MultiStyle text is fully dead. Idk what I did to it :(
-
[ ] Cannot select text on Ui bundles sized by percentage
Maybe intercept percentages and set as px on instantiation?
Replace evaluate() with custom percent to px fn?
@@ -15,8 +13,13 @@ BUGS INTRODUCED:
Now drag doesn't work either (tested on readonly, might be that)
Either way redraw on resize would be nice.
+[ ] Not all text boxes want to be click-selectable
+ Make utils.rs in examples; move click functions there.
+
BUGS SQUASHED:
[x] Font size has been changed somehow
[x] Cursor on readonly
+
+[x] MultiStyle text is fully dead. Idk what I did to it :(
diff --git a/src/lib.rs b/src/lib.rs
index 3f72a30..21b6536 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -85,7 +85,6 @@ impl CosmicEditor {
Shaping::Advanced,
);
}
- // TODO why not working?
CosmicText::MultiStyle(lines) => {
for line in lines {
let mut line_text = String::new();
@@ -153,15 +152,14 @@ fn cosmic_editor_builder(
if text.is_empty() {
text = "".into();
+ editor.0.buffer_mut().set_text(
+ &mut font_system.0,
+ text.as_str(),
+ attrs.0.as_attrs(),
+ Shaping::Advanced,
+ );
}
- editor.0.buffer_mut().set_text(
- &mut font_system.0,
- text.as_str(),
- attrs.0.as_attrs(),
- Shaping::Advanced,
- );
-
editor.0.buffer_mut().set_metrics(
&mut font_system.0,
Metrics::new(metrics.font_size, metrics.line_height).scale(metrics.scale_factor),
--
GitLab