From 92e60fe0347eac23a0744dbdf2fb8599ada68fac Mon Sep 17 00:00:00 2001
From: sam edelsten <samedelsten1@gmail.com>
Date: Sun, 23 Jul 2023 22:34:30 +0100
Subject: [PATCH] rewrite CosmicEdit to be more bevy-ish
also break all tests and examples whoooops
---
examples/bevy_api_testing.rs | 46 +
src/lib.rs | 1635 ++++++++++++++++++----------------
2 files changed, 925 insertions(+), 756 deletions(-)
create mode 100644 examples/bevy_api_testing.rs
diff --git a/examples/bevy_api_testing.rs b/examples/bevy_api_testing.rs
new file mode 100644
index 0000000..c2677d1
--- /dev/null
+++ b/examples/bevy_api_testing.rs
@@ -0,0 +1,46 @@
+use bevy::prelude::*;
+use bevy_cosmic_edit::{
+ ActiveEditor, CosmicEditPlugin, CosmicEditSpriteBundle, CosmicEditUiBundle,
+};
+
+fn setup(mut commands: Commands) {
+ commands.spawn(Camera2dBundle::default());
+
+ // spawn a new CosmicEditBundle
+ commands.spawn(CosmicEditUiBundle {
+ style: Style {
+ // Size and position of text box
+ width: Val::Px(300.),
+ height: Val::Px(50.),
+ left: Val::Px(100.),
+ top: Val::Px(100.),
+ ..default()
+ },
+ ..default()
+ });
+
+ let sprite_editor = commands
+ .spawn(CosmicEditSpriteBundle {
+ sprite: Sprite {
+ // Sets size of text box
+ custom_size: Some(Vec2::new(300., 100.)),
+ ..default()
+ },
+ // Position of text box
+ transform: Transform::from_xyz(100., 200., 0.),
+ ..default()
+ })
+ .id();
+
+ commands.insert_resource(ActiveEditor {
+ entity: Some(sprite_editor),
+ });
+}
+
+fn main() {
+ App::new()
+ .add_plugins(DefaultPlugins)
+ .add_plugins(CosmicEditPlugin::default())
+ .add_systems(Startup, setup)
+ .run();
+}
diff --git a/src/lib.rs b/src/lib.rs
index 0c6bfb8..0c5fd7c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::type_complexity)]
+
use std::{collections::VecDeque, path::PathBuf, time::Duration};
#[path = "utils.rs"]
pub mod utils;
@@ -7,13 +9,13 @@ use bevy::{
asset::HandleId,
input::mouse::{MouseScrollUnit, MouseWheel},
prelude::*,
- reflect::{TypePath, TypeUuid},
- render::render_resource::Extent3d,
+ render::{render_resource::Extent3d, texture::DEFAULT_IMAGE_HANDLE},
+ ui::FocusPolicy,
window::{PrimaryWindow, WindowScaleFactorChanged},
};
use cosmic_text::{
- Action, AttrsList, AttrsOwned, Buffer, BufferLine, Cursor, Edit, Editor, FontSystem, Metrics,
- Shaping, SwashCache,
+ Action, Attrs, AttrsList, AttrsOwned, Buffer, BufferLine, Cursor, Edit, Editor, FontSystem,
+ Metrics, Shaping, SwashCache,
};
use image::{imageops::FilterType, GenericImageView};
@@ -37,33 +39,205 @@ pub enum CosmicText {
MultiStyle(Vec<Vec<(String, cosmic_text::AttrsOwned)>>),
}
-#[derive(Clone)]
+/// Enum representing the position of the cosmic text.
+#[derive(Clone, Component, Default)]
+pub enum CosmicTextPosition {
+ // we have the space for full words :)
+ #[default]
+ Center,
+ TopLeft,
+}
+
+#[derive(Clone, Component)]
pub struct CosmicMetrics {
pub font_size: f32,
pub line_height: f32,
pub scale_factor: f32,
}
-/// Contains metadata for spawning cosmic edit, including text content, position, size, and style.
-#[derive(Clone)]
-pub struct CosmicEditMeta {
- pub text: CosmicText,
- pub text_pos: CosmicTextPos,
- pub attrs: cosmic_text::AttrsOwned,
- pub metrics: CosmicMetrics,
- pub font_system_handle: Handle<CosmicFont>,
- pub size: Option<(f32, f32)>, // None used for bevy-ui nodes to use parent size
- pub node: CosmicNode,
- pub bg: bevy::prelude::Color,
- pub bg_image: Option<Handle<Image>>,
- pub readonly: bool,
+impl Default for CosmicMetrics {
+ fn default() -> Self {
+ Self {
+ font_size: 12.,
+ line_height: 12.,
+ scale_factor: 1.,
+ }
+ }
}
-/// Enum representing the position of the cosmic text.
-#[derive(Clone)]
-pub enum CosmicTextPos {
- Center,
- TopLeft,
+#[derive(Resource)]
+pub struct CosmicFontSystem(FontSystem);
+
+#[derive(Component)]
+pub struct ReadOnly; // tag component
+
+#[derive(Component)]
+pub struct CosmicUiNode; // tag component
+
+#[derive(Component)]
+pub struct CosmicEditor(pub Editor);
+
+impl Default for CosmicEditor {
+ fn default() -> Self {
+ Self(Editor::new(Buffer::new_empty(Metrics::new(12., 14.))))
+ }
+}
+
+/// Adds the font system to each editor when added
+fn cosmic_editor_builder(
+ mut added_editors: Query<&mut CosmicEditor, Added<CosmicEditor>>,
+ mut font_system: ResMut<CosmicFontSystem>,
+) {
+ for mut editor in added_editors.iter_mut() {
+ editor
+ .0
+ .buffer_mut()
+ .set_text(&mut font_system.0, "", Attrs::new(), Shaping::Advanced);
+
+ editor
+ .0
+ .buffer_mut()
+ .set_size(&mut font_system.0, 100., 100.)
+ }
+}
+
+#[derive(Component)]
+pub struct CosmicAttrs(pub AttrsOwned);
+
+impl Default for CosmicAttrs {
+ fn default() -> Self {
+ CosmicAttrs(AttrsOwned::new(Attrs::new()))
+ }
+}
+
+#[derive(Component, Default)]
+pub struct CosmicBackground(Option<Handle<Image>>);
+
+#[derive(Bundle)]
+pub struct CosmicEditUiBundle {
+ // Bevy UI bits
+ /// Describes the logical size of the node
+ pub node: Node,
+ /// Marker component that signals this node is a button
+ pub button: Button,
+ /// Styles which control the layout (size and position) of the node and it's children
+ /// In some cases these styles also affect how the node drawn/painted.
+ pub style: Style,
+ /// Describes whether and how the button has been interacted with by the input
+ pub interaction: Interaction,
+ /// Whether this node should block interaction with lower nodes
+ pub focus_policy: FocusPolicy,
+ /// The background color, which serves as a "fill" for this node
+ pub background_color: BackgroundColor,
+ /// The color of the Node's border
+ pub border_color: BorderColor,
+ /// This is used as the cosmic text canvas
+ pub image: UiImage,
+ /// The transform of the node
+ ///
+ /// This field is automatically managed by the UI layout system.
+ /// To alter the position of the `NodeBundle`, use the properties of the [`Style`] component.
+ pub transform: Transform,
+ /// The global transform of the node
+ ///
+ /// This field is automatically managed by the UI layout system.
+ /// To alter the position of the `NodeBundle`, use the properties of the [`Style`] component.
+ pub global_transform: GlobalTransform,
+ /// Describes the visibility properties of the node
+ pub visibility: Visibility,
+ /// Algorithmically-computed indication of whether an entity is visible and should be extracted for rendering
+ pub computed_visibility: ComputedVisibility,
+ /// Indicates the depth at which the node should appear in the UI
+ pub z_index: ZIndex,
+ // cosmic bits
+ /// cosmic-text Editor, holds the text buffer + font system
+ pub editor: CosmicEditor,
+ /// text positioning enum
+ pub text_position: CosmicTextPosition,
+ /// text metrics
+ pub cosmic_metrics: CosmicMetrics,
+ /// edit history
+ pub cosmic_edit_history: CosmicEditHistory,
+ /// text attributes
+ pub cosmic_attrs: CosmicAttrs,
+ /// bg img
+ pub background_image: CosmicBackground,
+}
+
+impl Default for CosmicEditUiBundle {
+ fn default() -> Self {
+ Self {
+ focus_policy: FocusPolicy::Block,
+ node: Default::default(),
+ button: Default::default(),
+ style: Default::default(),
+ border_color: BorderColor(Color::NONE),
+ interaction: Default::default(),
+ background_color: Default::default(),
+ image: Default::default(),
+ transform: Default::default(),
+ global_transform: Default::default(),
+ visibility: Default::default(),
+ computed_visibility: Default::default(),
+ z_index: Default::default(),
+ editor: Default::default(),
+ text_position: Default::default(),
+ cosmic_metrics: Default::default(),
+ cosmic_edit_history: Default::default(),
+ cosmic_attrs: Default::default(),
+ background_image: Default::default(),
+ }
+ }
+}
+
+#[derive(Bundle)]
+pub struct CosmicEditSpriteBundle {
+ // Bevy Sprite Bits
+ pub sprite: Sprite,
+ pub transform: Transform,
+ pub global_transform: GlobalTransform,
+ pub texture: Handle<Image>,
+ /// User indication of whether an entity is visible
+ pub visibility: Visibility,
+ /// Algorithmically-computed indication of whether an entity is visible and should be extracted for rendering
+ pub computed_visibility: ComputedVisibility,
+ //
+ pub background_color: BackgroundColor,
+ // cosmic bits
+ /// cosmic-text Editor, holds the text buffer + font system
+ pub editor: CosmicEditor,
+ /// text positioning enum
+ pub text_position: CosmicTextPosition,
+ /// text metrics
+ pub cosmic_metrics: CosmicMetrics,
+ /// edit history
+ pub cosmic_edit_history: CosmicEditHistory,
+ /// text attributes
+ pub cosmic_attrs: CosmicAttrs,
+ /// bg img
+ pub background_image: CosmicBackground,
+}
+
+impl Default for CosmicEditSpriteBundle {
+ fn default() -> Self {
+ Self {
+ sprite: Default::default(),
+ transform: Default::default(),
+ global_transform: Default::default(),
+ texture: DEFAULT_IMAGE_HANDLE.typed(),
+ visibility: Visibility::Hidden,
+ computed_visibility: Default::default(),
+ //
+ background_color: Default::default(),
+ //
+ editor: Default::default(),
+ text_position: Default::default(),
+ cosmic_metrics: Default::default(),
+ cosmic_edit_history: Default::default(),
+ cosmic_attrs: Default::default(),
+ background_image: Default::default(),
+ }
+ }
}
#[derive(Clone)]
@@ -72,54 +246,42 @@ pub struct EditHistoryItem {
pub lines: Vec<Vec<(String, AttrsOwned)>>,
}
-#[derive(Component)]
+#[derive(Component, Default)]
pub struct CosmicEditHistory {
pub edits: VecDeque<EditHistoryItem>,
pub current_edit: usize,
}
-#[derive(Component)]
-pub struct CosmicEdit {
- pub editor: Editor,
- pub font_system: Handle<CosmicFont>,
- pub attrs: cosmic_text::AttrsOwned,
- pub text_pos: CosmicTextPos,
- pub bg: bevy::prelude::Color,
- pub bg_image: Option<Handle<Image>>,
- pub width: f32,
- pub height: f32,
- pub font_size: f32,
- pub line_height: f32,
- pub readonly: bool,
- pub is_ui_node: bool,
-}
-
-#[derive(TypeUuid, TypePath)]
-#[uuid = "DC6A0357-7941-4ADE-9332-24EA87E38961"]
-pub struct CosmicFont(pub FontSystem);
-
/// Plugin struct that adds systems and initializes resources related to cosmic edit functionality.
-pub struct CosmicEditPlugin;
+#[derive(Default)]
+pub struct CosmicEditPlugin {
+ pub font_config: CosmicFontConfig,
+}
impl Plugin for CosmicEditPlugin {
fn build(&self, app: &mut App) {
- app.add_systems(
- Update,
- (
- cosmic_edit_bevy_events,
- cosmic_edit_set_redraw,
- on_scale_factor_change,
- cosmic_edit_redraw_buffer_ui
- .before(cosmic_edit_set_redraw)
- .before(on_scale_factor_change),
- cosmic_edit_redraw_buffer.before(on_scale_factor_change),
- ),
- )
- .init_resource::<ActiveEditor>()
- .add_asset::<CosmicFont>()
- .insert_resource(SwashCacheState {
- swash_cache: SwashCache::new(),
- });
+ let font_system = create_cosmic_font_system(self.font_config.clone());
+
+ app.add_systems(PreUpdate, cosmic_editor_builder)
+ .add_systems(
+ Update,
+ (
+ change_active_editor,
+ cosmic_edit_bevy_events,
+ cosmic_edit_set_redraw,
+ on_scale_factor_change,
+ cosmic_edit_redraw_buffer_ui
+ .before(cosmic_edit_set_redraw)
+ .before(on_scale_factor_change),
+ cosmic_edit_redraw_buffer.before(on_scale_factor_change),
+ ),
+ )
+ .init_resource::<ActiveEditor>()
+ // .add_asset::<CosmicFont>()
+ .insert_resource(SwashCacheState {
+ swash_cache: SwashCache::new(),
+ })
+ .insert_resource(CosmicFontSystem(font_system));
}
}
@@ -129,20 +291,48 @@ pub struct ActiveEditor {
pub entity: Option<Entity>,
}
+fn change_active_editor(
+ mut commands: Commands,
+ mut interaction_query: Query<
+ (&Interaction, &mut CosmicEditor, Entity),
+ (Changed<Interaction>, With<CosmicEditor>),
+ >,
+) {
+ for (interaction, cosmic_edit, entity) in interaction_query.iter_mut() {
+ if let Interaction::Pressed = interaction {
+ info!("PRESSED");
+ commands.insert_resource(ActiveEditor {
+ entity: Some(entity),
+ });
+ info!("Widget text: {}", get_cosmic_text(cosmic_edit.0.buffer()));
+ }
+ }
+}
+
/// Resource struct that holds configuration options for cosmic fonts.
-#[derive(Resource, Default)]
+#[derive(Resource, Clone)]
pub struct CosmicFontConfig {
pub fonts_dir_path: Option<PathBuf>,
pub font_bytes: Option<Vec<&'static [u8]>>,
pub load_system_fonts: bool, // caution: this can be relatively slow
}
+impl Default for CosmicFontConfig {
+ fn default() -> Self {
+ Self {
+ load_system_fonts: true,
+ font_bytes: None,
+ fonts_dir_path: None,
+ }
+ }
+}
+
#[derive(Resource)]
struct SwashCacheState {
swash_cache: SwashCache,
}
-pub fn create_cosmic_font_system(cosmic_font_config: CosmicFontConfig) -> FontSystem {
+fn create_cosmic_font_system(cosmic_font_config: CosmicFontConfig) -> FontSystem {
let locale = sys_locale::get_locale().unwrap_or_else(|| String::from("en-US"));
let mut db = cosmic_text::fontdb::Database::new();
if let Some(dir_path) = cosmic_font_config.fonts_dir_path.clone() {
@@ -161,22 +351,18 @@ pub fn create_cosmic_font_system(cosmic_font_config: CosmicFontConfig) -> FontSy
fn on_scale_factor_change(
mut scale_factor_changed: EventReader<WindowScaleFactorChanged>,
- mut cosmic_edit_query: Query<&mut CosmicEdit, With<CosmicEdit>>,
- mut cosmic_fonts: ResMut<Assets<CosmicFont>>,
+ mut cosmic_query: Query<(&mut CosmicEditor, &mut CosmicMetrics)>,
+ mut font_system: ResMut<CosmicFontSystem>,
) {
if !scale_factor_changed.is_empty() {
let new_scale_factor = scale_factor_changed.iter().last().unwrap().scale_factor as f32;
- for mut cosmic_edit in &mut cosmic_edit_query.iter_mut() {
- if let Some(font_system) = cosmic_fonts.get_mut(&cosmic_edit.font_system) {
- let font_system = &mut font_system.0;
- let metrics = Metrics::new(cosmic_edit.font_size, cosmic_edit.line_height)
- .scale(new_scale_factor);
- cosmic_edit
- .editor
- .buffer_mut()
- .set_metrics(font_system, metrics);
- cosmic_edit.editor.buffer_mut().set_redraw(true);
- }
+ for (mut editor, metrics) in &mut cosmic_query.iter_mut() {
+ let font_system = &mut font_system.0;
+ let metrics =
+ Metrics::new(metrics.font_size, metrics.line_height).scale(new_scale_factor);
+
+ editor.0.buffer_mut().set_metrics(font_system, metrics);
+ editor.0.buffer_mut().set_redraw(true);
}
}
}
@@ -217,6 +403,43 @@ pub fn get_node_cursor_pos(
})
}
+// Sets text in a CosmicEdit
+pub fn cosmic_edit_set_text(
+ text: CosmicText,
+ attrs: AttrsOwned,
+ editor: &mut Editor,
+ font_system: &mut FontSystem,
+) {
+ editor.buffer_mut().lines.clear();
+ match text {
+ CosmicText::OneStyle(text) => {
+ editor.buffer_mut().set_text(
+ font_system,
+ text.as_str(),
+ attrs.as_attrs(),
+ Shaping::Advanced,
+ );
+ }
+ CosmicText::MultiStyle(lines) => {
+ for line in lines {
+ let mut line_text = String::new();
+ let mut attrs_list = AttrsList::new(attrs.as_attrs());
+ for (text, attrs) in line.iter() {
+ let start = line_text.len();
+ line_text.push_str(text);
+ let end = line_text.len();
+ attrs_list.add_span(start..end, attrs.as_attrs());
+ }
+ editor.buffer_mut().lines.push(BufferLine::new(
+ line_text,
+ attrs_list,
+ Shaping::Advanced,
+ ));
+ }
+ }
+ }
+}
+
/// Retrieves the cosmic text content from an editor.
///
/// # Arguments
@@ -226,6 +449,7 @@ pub fn get_node_cursor_pos(
/// # Returns
///
/// A `String` containing the cosmic text content.
+// TODO put this on the CosmicEdit impl
pub fn get_cosmic_text(buffer: &Buffer) -> String {
let mut text = String::new();
let line_count = buffer.lines.len();
@@ -241,6 +465,7 @@ pub fn get_cosmic_text(buffer: &Buffer) -> String {
text
}
+/// Returns texts from a MultiStyle buffer
pub fn get_text_spans(
buffer: &Buffer,
default_attrs: AttrsOwned,
@@ -279,9 +504,13 @@ pub fn get_text_spans(
spans
}
-fn save_edit_history(cosmic_edit: &mut CosmicEdit, edit_history: &mut CosmicEditHistory) {
+fn save_edit_history(
+ editor: &mut Editor,
+ attrs: &AttrsOwned,
+ edit_history: &mut CosmicEditHistory,
+) {
let edits = &edit_history.edits;
- let current_lines = get_text_spans(cosmic_edit.editor.buffer(), cosmic_edit.attrs.clone());
+ let current_lines = get_text_spans(editor.buffer(), attrs.clone());
let current_edit = edit_history.current_edit;
let mut new_edits = VecDeque::new();
new_edits.extend(edits.iter().take(current_edit + 1).cloned());
@@ -290,7 +519,7 @@ fn save_edit_history(cosmic_edit: &mut CosmicEdit, edit_history: &mut CosmicEdit
new_edits.drain(0..100);
}
new_edits.push_back(EditHistoryItem {
- cursor: cosmic_edit.editor.cursor(),
+ cursor: editor.cursor(),
lines: current_lines,
});
let len = new_edits.len();
@@ -300,7 +529,7 @@ fn save_edit_history(cosmic_edit: &mut CosmicEdit, edit_history: &mut CosmicEdit
};
}
-fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> cosmic_text::Color {
+pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> cosmic_text::Color {
cosmic_text::Color::rgba(
(color.r() * 255.) as u8,
(color.g() * 255.) as u8,
@@ -328,6 +557,9 @@ pub fn get_x_offset(buffer: &Buffer) -> i32 {
((buffer.size().0 - text_width) / 2.0) as i32
}
+#[allow(clippy::too_many_arguments, clippy::type_complexity)]
+// the meat of the input management
+// why public?
pub fn cosmic_edit_bevy_events(
windows: Query<&Window, With<PrimaryWindow>>,
active_editor: Res<ActiveEditor>,
@@ -336,15 +568,20 @@ pub fn cosmic_edit_bevy_events(
buttons: Res<Input<MouseButton>>,
mut cosmic_edit_query: Query<
(
- &mut CosmicEdit,
+ &mut CosmicEditor,
&mut CosmicEditHistory,
&GlobalTransform,
+ &CosmicAttrs,
+ &CosmicTextPosition,
Entity,
),
- With<CosmicEdit>,
+ With<CosmicEditor>,
>,
+ readonly_query: Query<&ReadOnly>,
+ style_query: Query<&mut Style>,
+ sprite_query: Query<&mut Sprite>,
+ mut font_system: ResMut<CosmicFontSystem>,
mut is_deleting: Local<bool>,
- mut font_system_assets: ResMut<Assets<CosmicFont>>,
mut scroll_evr: EventReader<MouseWheel>,
mut edits_duration: Local<Option<Duration>>,
mut undoredo_duration: Local<Option<Duration>>,
@@ -353,437 +590,428 @@ pub fn cosmic_edit_bevy_events(
let primary_window = windows.single();
let scale_factor = primary_window.scale_factor() as f32;
let (camera, camera_transform) = camera_q.iter().find(|(c, _)| c.is_active).unwrap();
- for (mut cosmic_edit, mut edit_history, node_transform, entity) in
+ for (mut editor, mut edit_history, node_transform, attrs, text_position, entity) in
&mut cosmic_edit_query.iter_mut()
{
+ let readonly = readonly_query.get(entity).is_ok();
+
+ let (width, height, is_ui_node) = match style_query.get(entity) {
+ Ok(style) => (
+ style.width.evaluate(1.).unwrap(),
+ style.height.evaluate(1.).unwrap(),
+ true,
+ ),
+ Err(_) => {
+ let sprite = sprite_query.get(entity).unwrap();
+ let size = sprite.custom_size.unwrap();
+ (size.x, size.y, false)
+ }
+ };
+
+ let editor = &mut editor.0;
+ let attrs = &attrs.0;
+
if active_editor.entity == Some(entity) {
- if let Some(font_system) = font_system_assets.get_mut(&cosmic_edit.font_system) {
- let now_ms = get_timestamp();
+ let now_ms = get_timestamp();
- #[cfg(target_os = "macos")]
- let command = keys.any_pressed([KeyCode::SuperLeft, KeyCode::SuperRight]);
+ #[cfg(target_os = "macos")]
+ let command = keys.any_pressed([KeyCode::SuperLeft, KeyCode::SuperRight]);
- #[cfg(not(target_os = "macos"))]
- let command = keys.any_pressed([KeyCode::ControlLeft, KeyCode::ControlRight]);
+ #[cfg(not(target_os = "macos"))]
+ let command = keys.any_pressed([KeyCode::ControlLeft, KeyCode::ControlRight]);
- let shift = keys.any_pressed([KeyCode::ShiftLeft, KeyCode::ShiftRight]);
+ let shift = keys.any_pressed([KeyCode::ShiftLeft, KeyCode::ShiftRight]);
- #[cfg(target_os = "macos")]
- let option = keys.any_pressed([KeyCode::AltLeft, KeyCode::AltRight]);
+ #[cfg(target_os = "macos")]
+ let option = keys.any_pressed([KeyCode::AltLeft, KeyCode::AltRight]);
- // if shift key is pressed
- let already_has_selection = cosmic_edit.editor.select_opt().is_some();
- if shift && !already_has_selection {
- let cursor = cosmic_edit.editor.cursor();
- cosmic_edit.editor.set_select_opt(Some(cursor));
- }
+ // if shift key is pressed
+ let already_has_selection = editor.select_opt().is_some();
+ if shift && !already_has_selection {
+ let cursor = editor.cursor();
+ editor.set_select_opt(Some(cursor));
+ }
- #[cfg(target_os = "macos")]
- let should_jump = command && option;
- #[cfg(not(target_os = "macos"))]
- let should_jump = command;
-
- if should_jump && keys.just_pressed(KeyCode::Left) {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::PreviousWord);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
- // RETURN
- return;
+ #[cfg(target_os = "macos")]
+ let should_jump = command && option;
+ #[cfg(not(target_os = "macos"))]
+ let should_jump = command;
+
+ if should_jump && keys.just_pressed(KeyCode::Left) {
+ editor.action(&mut font_system.0, Action::PreviousWord);
+ if !shift {
+ editor.set_select_opt(None);
}
- if should_jump && keys.just_pressed(KeyCode::Right) {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::NextWord);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
- // RETURN
- return;
+ // RETURN
+ return;
+ }
+ if should_jump && keys.just_pressed(KeyCode::Right) {
+ editor.action(&mut font_system.0, Action::NextWord);
+ if !shift {
+ editor.set_select_opt(None);
}
- if should_jump && keys.just_pressed(KeyCode::Home) {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::BufferStart);
- // there's a bug with cosmic text where it doesn't update the visual cursor for this action
- // TODO: fix upstream
- cosmic_edit.editor.buffer_mut().set_redraw(true);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
- // RETURN
- return;
+ // RETURN
+ return;
+ }
+ if should_jump && keys.just_pressed(KeyCode::Home) {
+ editor.action(&mut font_system.0, Action::BufferStart);
+ // there's a bug with cosmic text where it doesn't update the visual cursor for this action
+ // TODO: fix upstream
+ editor.buffer_mut().set_redraw(true);
+ if !shift {
+ editor.set_select_opt(None);
}
- if should_jump && keys.just_pressed(KeyCode::End) {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::BufferEnd);
- // there's a bug with cosmic text where it doesn't update the visual cursor for this action
- // TODO: fix upstream
- cosmic_edit.editor.buffer_mut().set_redraw(true);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
- // RETURN
- return;
+ // RETURN
+ return;
+ }
+ if should_jump && keys.just_pressed(KeyCode::End) {
+ editor.action(&mut font_system.0, Action::BufferEnd);
+ // there's a bug with cosmic text where it doesn't update the visual cursor for this action
+ // TODO: fix upstream
+ editor.buffer_mut().set_redraw(true);
+ if !shift {
+ editor.set_select_opt(None);
}
+ // RETURN
+ return;
+ }
- if keys.just_pressed(KeyCode::Left) {
- cosmic_edit.editor.action(&mut font_system.0, Action::Left);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
- // RETURN
- return;
+ if keys.just_pressed(KeyCode::Left) {
+ editor.action(&mut font_system.0, Action::Left);
+ if !shift {
+ editor.set_select_opt(None);
}
- if keys.just_pressed(KeyCode::Right) {
- cosmic_edit.editor.action(&mut font_system.0, Action::Right);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
- // RETURN
- return;
- }
- if keys.just_pressed(KeyCode::Up) {
- cosmic_edit.editor.action(&mut font_system.0, Action::Up);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
- // RETURN
- return;
+ // RETURN
+ return;
+ }
+ if keys.just_pressed(KeyCode::Right) {
+ editor.action(&mut font_system.0, Action::Right);
+ if !shift {
+ editor.set_select_opt(None);
}
- if keys.just_pressed(KeyCode::Down) {
- cosmic_edit.editor.action(&mut font_system.0, Action::Down);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
- // RETURN
- return;
+ // RETURN
+ return;
+ }
+ if keys.just_pressed(KeyCode::Up) {
+ editor.action(&mut font_system.0, Action::Up);
+ if !shift {
+ editor.set_select_opt(None);
}
- if !cosmic_edit.readonly && keys.just_pressed(KeyCode::Back) {
- #[cfg(target_arch = "wasm32")]
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::Backspace);
- *is_deleting = true;
+ // RETURN
+ return;
+ }
+ if keys.just_pressed(KeyCode::Down) {
+ editor.action(&mut font_system.0, Action::Down);
+ if !shift {
+ editor.set_select_opt(None);
}
- if !cosmic_edit.readonly && keys.just_released(KeyCode::Back) {
- *is_deleting = false;
+ // RETURN
+ return;
+ }
+
+ if !readonly && keys.just_pressed(KeyCode::Back) {
+ #[cfg(target_arch = "wasm32")]
+ editor.editor.action(&mut font_system.0, Action::Backspace);
+ *is_deleting = true;
+ }
+ if !readonly && keys.just_released(KeyCode::Back) {
+ *is_deleting = false;
+ }
+ if !readonly && keys.just_pressed(KeyCode::Delete) {
+ editor.action(&mut font_system.0, Action::Delete);
+ }
+ if keys.just_pressed(KeyCode::Escape) {
+ editor.action(&mut font_system.0, Action::Escape);
+ }
+ if command && keys.just_pressed(KeyCode::A) {
+ editor.action(&mut font_system.0, Action::BufferEnd);
+ let current_cursor = editor.cursor();
+ editor.set_select_opt(Some(Cursor {
+ line: 0,
+ index: 0,
+ affinity: current_cursor.affinity,
+ color: current_cursor.color,
+ }));
+ // RETURN
+ return;
+ }
+ if keys.just_pressed(KeyCode::Home) {
+ editor.action(&mut font_system.0, Action::Home);
+ if !shift {
+ editor.set_select_opt(None);
}
- if !cosmic_edit.readonly && keys.just_pressed(KeyCode::Delete) {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::Delete);
+ // RETURN
+ return;
+ }
+ if keys.just_pressed(KeyCode::End) {
+ editor.action(&mut font_system.0, Action::End);
+ if !shift {
+ editor.set_select_opt(None);
}
- if keys.just_pressed(KeyCode::Escape) {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::Escape);
+ // RETURN
+ return;
+ }
+ if keys.just_pressed(KeyCode::PageUp) {
+ editor.action(&mut font_system.0, Action::PageUp);
+ if !shift {
+ editor.set_select_opt(None);
}
- if command && keys.just_pressed(KeyCode::A) {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::BufferEnd);
- let current_cursor = cosmic_edit.editor.cursor();
- cosmic_edit.editor.set_select_opt(Some(Cursor {
- line: 0,
- index: 0,
- affinity: current_cursor.affinity,
- color: current_cursor.color,
- }));
- // RETURN
- return;
+ // RETURN
+ return;
+ }
+ if keys.just_pressed(KeyCode::PageDown) {
+ editor.action(&mut font_system.0, Action::PageDown);
+ if !shift {
+ editor.set_select_opt(None);
}
- if keys.just_pressed(KeyCode::Home) {
- cosmic_edit.editor.action(&mut font_system.0, Action::Home);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
+ // RETURN
+ return;
+ }
+
+ // redo
+ #[cfg(not(target_os = "windows"))]
+ let requested_redo = command && shift && keys.just_pressed(KeyCode::Z);
+ #[cfg(target_os = "windows")]
+ let requested_redo = command && keys.just_pressed(KeyCode::Y);
+
+ if !readonly && requested_redo {
+ let edits = &edit_history.edits;
+ if edits.is_empty() {
// RETURN
return;
}
- if keys.just_pressed(KeyCode::End) {
- cosmic_edit.editor.action(&mut font_system.0, Action::End);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
+ if edit_history.current_edit == edits.len() - 1 {
// RETURN
return;
}
- if keys.just_pressed(KeyCode::PageUp) {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::PageUp);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
+ let idx = edit_history.current_edit + 1;
+ if let Some(current_edit) = edits.get(idx) {
+ editor.buffer_mut().lines.clear();
+ for line in current_edit.lines.iter() {
+ let mut line_text = String::new();
+ let mut attrs_list = AttrsList::new(attrs.as_attrs());
+ for (text, attrs) in line.iter() {
+ let start = line_text.len();
+ line_text.push_str(text);
+ let end = line_text.len();
+ attrs_list.add_span(start..end, attrs.as_attrs());
+ }
+ editor.buffer_mut().lines.push(BufferLine::new(
+ line_text,
+ attrs_list,
+ Shaping::Advanced,
+ ));
}
- // RETURN
- return;
+ editor.set_cursor(current_edit.cursor);
+ editor.buffer_mut().set_redraw(true);
+ edit_history.current_edit += 1;
}
- if keys.just_pressed(KeyCode::PageDown) {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::PageDown);
- if !shift {
- cosmic_edit.editor.set_select_opt(None);
- }
+ *undoredo_duration = Some(Duration::from_millis(now_ms as u64));
+ // RETURN
+ return;
+ }
+ // undo
+ let requested_undo = command && keys.just_pressed(KeyCode::Z);
+
+ if !readonly && requested_undo {
+ let edits = &edit_history.edits;
+ if edits.is_empty() {
// RETURN
return;
}
-
- // redo
- #[cfg(not(target_os = "windows"))]
- let requested_redo = command && shift && keys.just_pressed(KeyCode::Z);
- #[cfg(target_os = "windows")]
- let requested_redo = command && keys.just_pressed(KeyCode::Y);
-
- if !cosmic_edit.readonly && requested_redo {
- let edits = &edit_history.edits;
- if edits.is_empty() {
- // RETURN
- return;
- }
- if edit_history.current_edit == edits.len() - 1 {
- // RETURN
- return;
- }
- let idx = edit_history.current_edit + 1;
- if let Some(current_edit) = edits.get(idx) {
- cosmic_edit.editor.buffer_mut().lines.clear();
- for line in current_edit.lines.iter() {
- let mut line_text = String::new();
- let mut attrs_list = AttrsList::new(cosmic_edit.attrs.as_attrs());
- for (text, attrs) in line.iter() {
- let start = line_text.len();
- line_text.push_str(text);
- let end = line_text.len();
- attrs_list.add_span(start..end, attrs.as_attrs());
- }
- cosmic_edit.editor.buffer_mut().lines.push(BufferLine::new(
- line_text,
- attrs_list,
- Shaping::Advanced,
- ));
- }
- cosmic_edit.editor.set_cursor(current_edit.cursor);
- cosmic_edit.editor.buffer_mut().set_redraw(true);
- edit_history.current_edit += 1;
- }
- *undoredo_duration = Some(Duration::from_millis(now_ms as u64));
+ if edit_history.current_edit <= 1 {
// RETURN
return;
}
- // undo
- let requested_undo = command && keys.just_pressed(KeyCode::Z);
-
- if !cosmic_edit.readonly && requested_undo {
- let edits = &edit_history.edits;
- if edits.is_empty() {
- // RETURN
- return;
- }
- if edit_history.current_edit <= 1 {
- // RETURN
- return;
- }
- let idx = edit_history.current_edit - 1;
- if let Some(current_edit) = edits.get(idx) {
- cosmic_edit.editor.buffer_mut().lines.clear();
- for line in current_edit.lines.iter() {
- let mut line_text = String::new();
- let mut attrs_list = AttrsList::new(cosmic_edit.attrs.as_attrs());
- for (text, attrs) in line.iter() {
- let start = line_text.len();
- line_text.push_str(text);
- let end = line_text.len();
- attrs_list.add_span(start..end, attrs.as_attrs());
- }
- cosmic_edit.editor.buffer_mut().lines.push(BufferLine::new(
- line_text,
- attrs_list,
- Shaping::Advanced,
- ));
+ let idx = edit_history.current_edit - 1;
+ if let Some(current_edit) = edits.get(idx) {
+ editor.buffer_mut().lines.clear();
+ for line in current_edit.lines.iter() {
+ let mut line_text = String::new();
+ let mut attrs_list = AttrsList::new(attrs.as_attrs());
+ for (text, attrs) in line.iter() {
+ let start = line_text.len();
+ line_text.push_str(text);
+ let end = line_text.len();
+ attrs_list.add_span(start..end, attrs.as_attrs());
}
- cosmic_edit.editor.set_cursor(current_edit.cursor);
- cosmic_edit.editor.buffer_mut().set_redraw(true);
- edit_history.current_edit -= 1;
+ editor.buffer_mut().lines.push(BufferLine::new(
+ line_text,
+ attrs_list,
+ Shaping::Advanced,
+ ));
}
- *undoredo_duration = Some(Duration::from_millis(now_ms as u64));
- // RETURN
- return;
+ editor.set_cursor(current_edit.cursor);
+ editor.buffer_mut().set_redraw(true);
+ edit_history.current_edit -= 1;
}
+ *undoredo_duration = Some(Duration::from_millis(now_ms as u64));
+ // RETURN
+ return;
+ }
- let mut is_clipboard = false;
- #[cfg(not(target_arch = "wasm32"))]
- {
- if let Ok(mut clipboard) = arboard::Clipboard::new() {
- if command && keys.just_pressed(KeyCode::C) {
- if let Some(text) = cosmic_edit.editor.copy_selection() {
- clipboard.set_text(text).unwrap();
- // RETURN
- return;
- }
+ let mut is_clipboard = false;
+ #[cfg(not(target_arch = "wasm32"))]
+ {
+ if let Ok(mut clipboard) = arboard::Clipboard::new() {
+ if command && keys.just_pressed(KeyCode::C) {
+ if let Some(text) = editor.copy_selection() {
+ clipboard.set_text(text).unwrap();
+ // RETURN
+ return;
}
- if !cosmic_edit.readonly && command && keys.just_pressed(KeyCode::X) {
- if let Some(text) = cosmic_edit.editor.copy_selection() {
- clipboard.set_text(text).unwrap();
- cosmic_edit.editor.delete_selection();
- }
- is_clipboard = true;
+ }
+ if !readonly && command && keys.just_pressed(KeyCode::X) {
+ if let Some(text) = editor.copy_selection() {
+ clipboard.set_text(text).unwrap();
+ editor.delete_selection();
}
- if !cosmic_edit.readonly && command && keys.just_pressed(KeyCode::V) {
- if let Ok(text) = clipboard.get_text() {
- for c in text.chars() {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::Insert(c));
- }
+ is_clipboard = true;
+ }
+ if !readonly && command && keys.just_pressed(KeyCode::V) {
+ if let Ok(text) = clipboard.get_text() {
+ for c in text.chars() {
+ editor.action(&mut font_system.0, Action::Insert(c));
}
- is_clipboard = true;
}
+ is_clipboard = true;
}
}
- let (offset_x, offset_y) = match cosmic_edit.text_pos {
- CosmicTextPos::Center => (
- get_x_offset(cosmic_edit.editor.buffer()),
- get_y_offset(cosmic_edit.editor.buffer()),
- ),
- CosmicTextPos::TopLeft => (0, 0),
- };
- let point = |node_cursor_pos: (f32, f32)| {
+ }
+ let (offset_x, offset_y) = match text_position {
+ CosmicTextPosition::Center => {
+ (get_x_offset(editor.buffer()), get_y_offset(editor.buffer()))
+ }
+ CosmicTextPosition::TopLeft => (0, 0),
+ };
+ let point = |node_cursor_pos: (f32, f32)| {
+ (
+ (node_cursor_pos.0 * scale_factor) as i32 - offset_x,
+ (node_cursor_pos.1 * scale_factor) as i32 - offset_y,
+ )
+ };
+
+ if buttons.just_pressed(MouseButton::Left) {
+ if let Some(node_cursor_pos) = get_node_cursor_pos(
+ primary_window,
+ node_transform,
(
- (node_cursor_pos.0 * scale_factor) as i32 - offset_x,
- (node_cursor_pos.1 * scale_factor) as i32 - offset_y,
- )
- };
- if buttons.just_pressed(MouseButton::Left) {
- if let Some(node_cursor_pos) = get_node_cursor_pos(
- primary_window,
- node_transform,
- (cosmic_edit.width, cosmic_edit.height),
- cosmic_edit.is_ui_node,
- camera,
- camera_transform,
- ) {
- let (x, y) = point(node_cursor_pos);
- if shift {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::Drag { x, y });
- } else {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::Click { x, y });
- }
+ // TODO this does not work with percent sizes
+ // well like I haven't tested it so it might
+ width, height,
+ ),
+ is_ui_node,
+ camera,
+ camera_transform,
+ ) {
+ let (x, y) = point(node_cursor_pos);
+ if shift {
+ editor.action(&mut font_system.0, Action::Drag { x, y });
+ } else {
+ editor.action(&mut font_system.0, Action::Click { x, y });
}
- // RETURN
- return;
}
- if buttons.pressed(MouseButton::Left) {
- if let Some(node_cursor_pos) = get_node_cursor_pos(
- primary_window,
- node_transform,
- (cosmic_edit.width, cosmic_edit.height),
- cosmic_edit.is_ui_node,
- camera,
- camera_transform,
- ) {
- let (x, y) = point(node_cursor_pos);
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::Drag { x, y });
- }
- // RETURN
- return;
+ // RETURN
+ return;
+ }
+ if buttons.pressed(MouseButton::Left) {
+ if let Some(node_cursor_pos) = get_node_cursor_pos(
+ primary_window,
+ node_transform,
+ (width, height),
+ is_ui_node,
+ camera,
+ camera_transform,
+ ) {
+ let (x, y) = point(node_cursor_pos);
+ editor.action(&mut font_system.0, Action::Drag { x, y });
}
- for ev in scroll_evr.iter() {
- match ev.unit {
- MouseScrollUnit::Line => {
- cosmic_edit.editor.action(
- &mut font_system.0,
- Action::Scroll {
- lines: -ev.y as i32,
- },
- );
- }
- MouseScrollUnit::Pixel => {
- let line_height = cosmic_edit.editor.buffer().metrics().line_height;
- cosmic_edit.editor.action(
- &mut font_system.0,
- Action::Scroll {
- lines: -(ev.y / line_height) as i32,
- },
- );
- }
+ // RETURN
+ return;
+ }
+ for ev in scroll_evr.iter() {
+ match ev.unit {
+ MouseScrollUnit::Line => {
+ editor.action(
+ &mut font_system.0,
+ Action::Scroll {
+ lines: -ev.y as i32,
+ },
+ );
+ }
+ MouseScrollUnit::Pixel => {
+ let line_height = editor.buffer().metrics().line_height;
+ editor.action(
+ &mut font_system.0,
+ Action::Scroll {
+ lines: -(ev.y / line_height) as i32,
+ },
+ );
}
}
+ }
- if cosmic_edit.readonly {
- // RETURN
- return;
- }
+ if readonly {
+ // RETURN
+ return;
+ }
- let mut is_edit = is_clipboard;
- let mut is_return = false;
- if keys.just_pressed(KeyCode::Return) {
- is_return = true;
- is_edit = true;
- // to have new line on wasm rather than E
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::Insert('\n'));
- }
+ let mut is_edit = is_clipboard;
+ let mut is_return = false;
+ if keys.just_pressed(KeyCode::Return) {
+ is_return = true;
+ is_edit = true;
+ // to have new line on wasm rather than E
+ editor.action(&mut font_system.0, Action::Insert('\n'));
+ }
- if !(is_clipboard || is_return) {
- for char_ev in char_evr.iter() {
- is_edit = true;
- if *is_deleting {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::Backspace);
- } else {
- cosmic_edit
- .editor
- .action(&mut font_system.0, Action::Insert(char_ev.char));
- }
+ if !(is_clipboard || is_return) {
+ for char_ev in char_evr.iter() {
+ is_edit = true;
+ if *is_deleting {
+ editor.action(&mut font_system.0, Action::Backspace);
+ } else {
+ editor.action(&mut font_system.0, Action::Insert(char_ev.char));
}
}
+ }
- if !is_edit {
- // RETURN
- return;
- }
+ if !is_edit {
+ // RETURN
+ return;
+ }
- if let Some(last_edit_duration) = *edits_duration {
- if Duration::from_millis(now_ms as u64) - last_edit_duration
- > Duration::from_millis(150)
- {
- save_edit_history(&mut cosmic_edit, &mut edit_history);
- *edits_duration = Some(Duration::from_millis(now_ms as u64));
- }
- } else {
- save_edit_history(&mut cosmic_edit, &mut edit_history);
+ if let Some(last_edit_duration) = *edits_duration {
+ if Duration::from_millis(now_ms as u64) - last_edit_duration
+ > Duration::from_millis(150)
+ {
+ save_edit_history(editor, attrs, &mut edit_history);
*edits_duration = Some(Duration::from_millis(now_ms as u64));
}
+ } else {
+ save_edit_history(editor, attrs, &mut edit_history);
+ *edits_duration = Some(Duration::from_millis(now_ms as u64));
}
}
}
}
-fn cosmic_edit_set_redraw(mut cosmic_edit_query: Query<&mut CosmicEdit, Added<CosmicEdit>>) {
- for mut cosmic_edit in cosmic_edit_query.iter_mut() {
- cosmic_edit.editor.buffer_mut().set_redraw(true);
+fn cosmic_edit_set_redraw(mut cosmic_edit_query: Query<&mut CosmicEditor, Added<CosmicEditor>>) {
+ for mut editor in cosmic_edit_query.iter_mut() {
+ editor.0.buffer_mut().set_redraw(true);
}
}
+#[allow(clippy::too_many_arguments)]
fn redraw_buffer_common(
images: &mut ResMut<Assets<Image>>,
swash_cache_state: &mut ResMut<SwashCacheState>,
- cosmic_edit: &mut CosmicEdit,
- img_handle: &mut Handle<Image>,
- font_system_assets: &mut ResMut<Assets<CosmicFont>>,
+ editor: &mut Editor,
+ background_image: Option<Handle<Image>>,
+ background_color: Color,
+ cosmic_canvas_img_handle: &mut Handle<Image>,
+ text_position: &CosmicTextPosition,
+ font_system: &mut ResMut<CosmicFontSystem>,
scale_factor: f32,
original_width: f32,
original_height: f32,
@@ -791,96 +1019,95 @@ fn redraw_buffer_common(
let width = original_width * scale_factor;
let height = original_height * scale_factor;
let swash_cache = &mut swash_cache_state.swash_cache;
- if let Some(font_system) = font_system_assets.get_mut(&cosmic_edit.font_system) {
- cosmic_edit.editor.shape_as_needed(&mut font_system.0);
- if cosmic_edit.editor.buffer().redraw() {
- cosmic_edit
- .editor
- .buffer_mut()
- .set_size(&mut font_system.0, width, height);
- let font_color = cosmic_text::Color::rgb(0, 0, 0);
-
- let mut pixels = vec![0; width as usize * height as usize * 4];
- if let Some(bg_image) = cosmic_edit.bg_image.clone() {
- let image = images.get(&bg_image).unwrap();
-
- let mut dynamic_image = image.clone().try_into_dynamic().unwrap();
- if image.size().x != width || image.size().y != height {
- dynamic_image = dynamic_image.resize_to_fill(
- width as u32,
- height as u32,
- FilterType::Triangle,
- );
- }
- for (i, (_, _, rgba)) in dynamic_image.pixels().enumerate() {
- if let Some(p) = pixels.get_mut(i * 4..(i + 1) * 4) {
- p[0] = rgba[0];
- p[1] = rgba[1];
- p[2] = rgba[2];
- p[3] = rgba[3];
- }
- }
- } else {
- let bg = cosmic_edit.bg;
- for pixel in pixels.chunks_exact_mut(4) {
- pixel[0] = (bg.r() * 255.) as u8; // Red component
- pixel[1] = (bg.g() * 255.) as u8; // Green component
- pixel[2] = (bg.b() * 255.) as u8; // Blue component
- pixel[3] = (bg.a() * 255.) as u8; // Alpha component
+ editor.shape_as_needed(&mut font_system.0);
+ if editor.buffer().redraw() {
+ println!("REDRAW");
+
+ editor
+ .buffer_mut()
+ .set_size(&mut font_system.0, width, height);
+ let font_color = cosmic_text::Color::rgb(0, 0, 0);
+
+ let mut pixels = vec![0; width as usize * height as usize * 4];
+ if let Some(bg_image) = background_image {
+ let image = images.get(&bg_image).unwrap();
+
+ let mut dynamic_image = image.clone().try_into_dynamic().unwrap();
+ if image.size().x != width || image.size().y != height {
+ dynamic_image =
+ dynamic_image.resize_to_fill(width as u32, height as u32, FilterType::Triangle);
+ }
+ for (i, (_, _, rgba)) in dynamic_image.pixels().enumerate() {
+ if let Some(p) = pixels.get_mut(i * 4..(i + 1) * 4) {
+ p[0] = rgba[0];
+ p[1] = rgba[1];
+ p[2] = rgba[2];
+ p[3] = rgba[3];
}
}
+ } else {
+ let bg = background_color;
+ for pixel in pixels.chunks_exact_mut(4) {
+ pixel[0] = (bg.r() * 255.) as u8; // Red component
+ pixel[1] = (bg.g() * 255.) as u8; // Green component
+ pixel[2] = (bg.b() * 255.) as u8; // Blue component
+ pixel[3] = (bg.a() * 255.) as u8; // Alpha component
+ }
+ }
- let (offset_y, offset_x) = match cosmic_edit.text_pos {
- CosmicTextPos::Center => (
- get_y_offset(cosmic_edit.editor.buffer()),
- get_x_offset(cosmic_edit.editor.buffer()),
- ),
- CosmicTextPos::TopLeft => (0, 0),
- };
- cosmic_edit.editor.draw(
- &mut font_system.0,
- swash_cache,
- font_color,
- |x, y, w, h, color| {
- for row in 0..h as i32 {
- for col in 0..w as i32 {
- draw_pixel(
- &mut pixels,
- width as i32,
- height as i32,
- x + col + offset_x,
- y + row + offset_y,
- color,
- );
- }
+ let (offset_y, offset_x) = match text_position {
+ CosmicTextPosition::Center => {
+ (get_y_offset(editor.buffer()), get_x_offset(editor.buffer()))
+ }
+ CosmicTextPosition::TopLeft => (0, 0),
+ };
+
+ editor.draw(
+ &mut font_system.0,
+ swash_cache,
+ font_color,
+ |x, y, w, h, color| {
+ for row in 0..h as i32 {
+ for col in 0..w as i32 {
+ draw_pixel(
+ &mut pixels,
+ width as i32,
+ height as i32,
+ x + col + offset_x,
+ y + row + offset_y,
+ color,
+ );
}
- },
- );
- cosmic_edit.editor.buffer_mut().set_redraw(false);
-
- if let Some(prev_image) = images.get_mut(img_handle) {
- if *img_handle == bevy::render::texture::DEFAULT_IMAGE_HANDLE.typed() {
- let mut prev_image = prev_image.clone();
- prev_image.data.clear();
- prev_image.data.extend_from_slice(pixels.as_slice());
- prev_image.resize(Extent3d {
- width: width as u32,
- height: height as u32,
- depth_or_array_layers: 1,
- });
- let handle_id: HandleId = HandleId::random::<Image>();
- let new_handle: Handle<Image> = Handle::weak(handle_id);
- let new_handle = images.set(new_handle, prev_image);
- *img_handle = new_handle;
- } else {
- prev_image.data.clear();
- prev_image.data.extend_from_slice(pixels.as_slice());
- prev_image.resize(Extent3d {
- width: width as u32,
- height: height as u32,
- depth_or_array_layers: 1,
- });
}
+ },
+ );
+ editor.buffer_mut().set_redraw(false);
+
+ println!("TRY CLEAR");
+ if let Some(prev_image) = images.get_mut(cosmic_canvas_img_handle) {
+ if *cosmic_canvas_img_handle == bevy::render::texture::DEFAULT_IMAGE_HANDLE.typed() {
+ println!("SWAP HANDLE");
+ let mut prev_image = prev_image.clone();
+ prev_image.data.clear();
+ prev_image.data.extend_from_slice(pixels.as_slice());
+ prev_image.resize(Extent3d {
+ width: width as u32,
+ height: height as u32,
+ depth_or_array_layers: 1,
+ });
+ let handle_id: HandleId = HandleId::random::<Image>();
+ let new_handle: Handle<Image> = Handle::weak(handle_id);
+ let new_handle = images.set(new_handle, prev_image);
+ *cosmic_canvas_img_handle = new_handle;
+ } else {
+ println!("CLEAR CANVAS");
+ prev_image.data.clear();
+ prev_image.data.extend_from_slice(pixels.as_slice());
+ prev_image.resize(Extent3d {
+ width: width as u32,
+ height: height as u32,
+ depth_or_array_layers: 1,
+ });
}
}
}
@@ -890,27 +1117,41 @@ fn cosmic_edit_redraw_buffer_ui(
windows: Query<&Window, With<PrimaryWindow>>,
mut images: ResMut<Assets<Image>>,
mut swash_cache_state: ResMut<SwashCacheState>,
- mut cosmic_edit_query: Query<
- (&mut CosmicEdit, &mut UiImage, &Node, &mut Visibility),
- With<CosmicEdit>,
- >,
- mut font_system_assets: ResMut<Assets<CosmicFont>>,
+ mut cosmic_edit_query: Query<(
+ &mut CosmicEditor,
+ &CosmicBackground,
+ &BackgroundColor,
+ &CosmicTextPosition,
+ &mut UiImage,
+ &Node,
+ &mut Visibility,
+ )>,
+ mut font_system: ResMut<CosmicFontSystem>,
) {
let primary_window = windows.single();
- for (mut cosmic_edit, mut img, node, mut visibility) in &mut cosmic_edit_query.iter_mut() {
- if node.size().x != 0. && node.size().y != 0. {
- cosmic_edit.width = node.size().x;
- cosmic_edit.height = node.size().y;
- }
- let width = cosmic_edit.width;
- let height = cosmic_edit.height;
+ for (
+ mut editor,
+ background_image,
+ background_color,
+ text_position,
+ mut img,
+ node,
+ mut visibility,
+ ) in &mut cosmic_edit_query.iter_mut()
+ {
+ // provide min sizes to prevent render panic
+ let width = node.size().x.max(1.);
+ let height = node.size().y.max(1.);
redraw_buffer_common(
&mut images,
&mut swash_cache_state,
- &mut cosmic_edit,
+ &mut editor.0,
+ background_image.0.clone(),
+ background_color.0,
&mut img.texture,
- &mut font_system_assets,
+ text_position,
+ &mut font_system,
primary_window.scale_factor() as f32,
width,
height,
@@ -928,22 +1169,41 @@ fn cosmic_edit_redraw_buffer(
windows: Query<&Window, With<PrimaryWindow>>,
mut images: ResMut<Assets<Image>>,
mut swash_cache_state: ResMut<SwashCacheState>,
- mut cosmic_edit_query: Query<
- (&mut CosmicEdit, &mut Handle<Image>, &mut Visibility),
- With<CosmicEdit>,
- >,
- mut font_system_assets: ResMut<Assets<CosmicFont>>,
+ mut cosmic_edit_query: Query<(
+ &mut CosmicEditor,
+ &Sprite,
+ &CosmicBackground,
+ &BackgroundColor,
+ &CosmicTextPosition,
+ &mut Handle<Image>,
+ &mut Visibility,
+ )>,
+ mut font_system: ResMut<CosmicFontSystem>,
) {
let primary_window = windows.single();
- for (mut cosmic_edit, mut handle, mut visibility) in &mut cosmic_edit_query.iter_mut() {
- let width = cosmic_edit.width;
- let height = cosmic_edit.height;
+ for (
+ mut editor,
+ sprite,
+ background_image,
+ background_color,
+ text_position,
+ mut handle,
+ mut visibility,
+ ) in &mut cosmic_edit_query.iter_mut()
+ {
+ // provide min sizes to prevent render panic
+ let width = sprite.custom_size.unwrap().x.max(1.);
+ let height = sprite.custom_size.unwrap().y.max(1.);
+
redraw_buffer_common(
&mut images,
&mut swash_cache_state,
- &mut cosmic_edit,
+ &mut editor.0,
+ background_image.0.clone(),
+ background_color.0,
&mut handle,
- &mut font_system_assets,
+ text_position,
+ &mut font_system,
primary_window.scale_factor() as f32,
width,
height,
@@ -957,143 +1217,6 @@ fn cosmic_edit_redraw_buffer(
}
}
-pub fn cosmic_edit_set_text(
- text: CosmicText,
- attrs: AttrsOwned,
- editor: &mut Editor,
- font_system: &mut FontSystem,
-) {
- editor.buffer_mut().lines.clear();
- match text {
- CosmicText::OneStyle(text) => {
- editor.buffer_mut().set_text(
- font_system,
- text.as_str(),
- attrs.as_attrs(),
- Shaping::Advanced,
- );
- }
- CosmicText::MultiStyle(lines) => {
- for line in lines {
- let mut line_text = String::new();
- let mut attrs_list = AttrsList::new(attrs.as_attrs());
- for (text, attrs) in line.iter() {
- let start = line_text.len();
- line_text.push_str(text);
- let end = line_text.len();
- attrs_list.add_span(start..end, attrs.as_attrs());
- }
- editor.buffer_mut().lines.push(BufferLine::new(
- line_text,
- attrs_list,
- Shaping::Advanced,
- ));
- }
- }
- }
-}
-
-/// Spawns a cosmic edit entity with the provided configuration.
-///
-/// # Returns
-///
-/// The `Entity` identifier of the spawned cosmic edit entity.
-pub fn spawn_cosmic_edit(
- commands: &mut Commands,
- cosmic_fonts: &mut ResMut<Assets<CosmicFont>>,
- cosmic_edit_meta: CosmicEditMeta,
-) -> Entity {
- let font_system = cosmic_fonts
- .get_mut(&cosmic_edit_meta.font_system_handle)
- .unwrap();
- let scale_factor = cosmic_edit_meta.metrics.scale_factor;
- let font_size = cosmic_edit_meta.metrics.font_size;
- let line_height = cosmic_edit_meta.metrics.line_height;
- let metrics = Metrics::new(font_size, line_height).scale(scale_factor);
- let buffer = Buffer::new(&mut font_system.0, metrics);
- let mut editor = Editor::new(buffer);
- cosmic_edit_set_text(
- cosmic_edit_meta.text,
- cosmic_edit_meta.attrs.clone(),
- &mut editor,
- &mut font_system.0,
- );
- if let Some((width, height)) = cosmic_edit_meta.size {
- editor.buffer_mut().set_size(
- &mut font_system.0,
- width * scale_factor,
- height * scale_factor,
- );
- }
- let mut cursor = editor.cursor();
- if cosmic_edit_meta.readonly {
- cursor.color = Some(bevy_color_to_cosmic(cosmic_edit_meta.bg));
- }
- editor.set_cursor(cursor);
-
- let mut edits = VecDeque::new();
- if !cosmic_edit_meta.readonly {
- edits.push_back(EditHistoryItem {
- cursor,
- lines: get_text_spans(editor.buffer(), cosmic_edit_meta.attrs.clone()),
- });
- }
- let edit_history = CosmicEditHistory {
- edits,
- current_edit: 0,
- };
- let mut cosmic_edit_component = CosmicEdit {
- editor,
- font_system: cosmic_edit_meta.font_system_handle,
- text_pos: cosmic_edit_meta.text_pos,
- bg: cosmic_edit_meta.bg,
- is_ui_node: false,
- font_size,
- line_height,
- width: cosmic_edit_meta.size.unwrap_or((1., 1.)).0,
- height: cosmic_edit_meta.size.unwrap_or((1., 1.)).1,
- readonly: cosmic_edit_meta.readonly,
- attrs: cosmic_edit_meta.attrs.clone(),
- bg_image: cosmic_edit_meta.bg_image,
- };
- match cosmic_edit_meta.node {
- CosmicNode::Ui => {
- cosmic_edit_component.is_ui_node = true;
- let style = Style {
- width: Val::Percent(100.),
- height: Val::Percent(100.),
- ..default()
- };
- let button_bundle = ButtonBundle {
- visibility: Visibility::Hidden,
- focus_policy: bevy::ui::FocusPolicy::Pass,
- style,
- ..default()
- };
- commands
- .spawn((button_bundle, cosmic_edit_component, edit_history))
- .id()
- }
- CosmicNode::Sprite(sprite_node) => {
- let sprite = SpriteBundle {
- visibility: Visibility::Hidden,
- sprite: Sprite {
- custom_size: Some(Vec2::new(
- cosmic_edit_component.width,
- cosmic_edit_component.height,
- )),
- ..default()
- },
- transform: sprite_node.transform,
- ..default()
- };
- commands
- .spawn((sprite, cosmic_edit_component, edit_history))
- .id()
- }
- }
-}
-
fn draw_pixel(
buffer: &mut [u8],
width: i32,
@@ -1143,70 +1266,70 @@ fn draw_pixel(
buffer[offset + 3] = (current >> 24) as u8;
}
-#[cfg(test)]
-mod tests {
- use bevy::prelude::*;
- use cosmic_text::{Attrs, AttrsOwned};
-
- use crate::*;
-
- fn test_spawn_cosmic_edit_system(
- mut commands: Commands,
- mut cosmic_fonts: ResMut<Assets<CosmicFont>>,
- ) {
- let cosmic_font_config = CosmicFontConfig {
- fonts_dir_path: None,
- font_bytes: None,
- load_system_fonts: true,
- };
- let font_system = create_cosmic_font_system(cosmic_font_config);
- let font_system_handle = cosmic_fonts.add(CosmicFont(font_system));
- let cosmic_edit_meta = CosmicEditMeta {
- text: CosmicText::OneStyle("Blah".to_string()),
- attrs: AttrsOwned::new(Attrs::new()),
- metrics: CosmicMetrics {
- font_size: 14.,
- line_height: 18.,
- scale_factor: 1.,
- },
- text_pos: CosmicTextPos::Center,
- font_system_handle,
- node: CosmicNode::Ui,
- size: None,
- bg: bevy::prelude::Color::NONE,
- readonly: false,
- bg_image: None,
- };
- spawn_cosmic_edit(&mut commands, &mut cosmic_fonts, cosmic_edit_meta);
- }
-
- #[test]
- fn test_spawn_cosmic_edit() {
- let mut app = App::new();
- app.add_plugins(TaskPoolPlugin::default());
- app.add_plugins(AssetPlugin::default());
- app.add_systems(Update, test_spawn_cosmic_edit_system);
-
- let input = Input::<KeyCode>::default();
- app.insert_resource(input);
- let mouse_input: Input<MouseButton> = Input::<MouseButton>::default();
- app.insert_resource(mouse_input);
- app.add_asset::<Image>();
- app.add_asset::<CosmicFont>();
-
- app.add_event::<ReceivedCharacter>();
-
- app.update();
-
- let mut text_nodes_query = app.world.query::<&CosmicEdit>();
- for node in text_nodes_query.iter(&app.world) {
- insta::assert_debug_snapshot!(node
- .editor
- .buffer()
- .lines
- .iter()
- .map(|line| line.text())
- .collect::<Vec<_>>());
- }
- }
-}
+// #[cfg(test)]
+// mod tests {
+// use bevy::prelude::*;
+// use cosmic_text::{Attrs, AttrsOwned};
+
+// use crate::*;
+
+// fn test_spawn_cosmic_edit_system(
+// mut commands: Commands,
+// mut cosmic_fonts: ResMut<Assets<CosmicFont>>,
+// ) {
+// let cosmic_font_config = CosmicFontConfig {
+// fonts_dir_path: None,
+// font_bytes: None,
+// load_system_fonts: true,
+// };
+// let font_system = create_cosmic_font_system(cosmic_font_config);
+// let font_system_handle = cosmic_fonts.add(CosmicFont(font_system));
+// let cosmic_edit_meta = CosmicEditMeta {
+// text: CosmicText::OneStyle("Blah".to_string()),
+// attrs: AttrsOwned::new(Attrs::new()),
+// metrics: CosmicMetrics {
+// font_size: 14.,
+// line_height: 18.,
+// scale_factor: 1.,
+// },
+// text_pos: CosmicTextPosition::Center,
+// font_system_handle,
+// node: CosmicNode::Ui,
+// size: None,
+// bg: bevy::prelude::Color::NONE,
+// readonly: false,
+// bg_image: None,
+// };
+// spawn_cosmic_edit(&mut commands, &mut cosmic_fonts, cosmic_edit_meta);
+// }
+
+// #[test]
+// fn test_spawn_cosmic_edit() {
+// let mut app = App::new();
+// app.add_plugins(TaskPoolPlugin::default());
+// app.add_plugins(AssetPlugin::default());
+// app.add_systems(Update, test_spawn_cosmic_edit_system);
+
+// let input = Input::<KeyCode>::default();
+// app.insert_resource(input);
+// let mouse_input: Input<MouseButton> = Input::<MouseButton>::default();
+// app.insert_resource(mouse_input);
+// app.add_asset::<Image>();
+// app.add_asset::<CosmicFont>();
+
+// app.add_event::<ReceivedCharacter>();
+
+// app.update();
+
+// let mut text_nodes_query = app.world.query::<&CosmicEdit>();
+// for node in text_nodes_query.iter(&app.world) {
+// insta::assert_debug_snapshot!(node
+// .editor
+// .buffer()
+// .lines
+// .iter()
+// .map(|line| line.text())
+// .collect::<Vec<_>>());
+// }
+// }
+// }
--
GitLab