Skip to content
Snippets Groups Projects
Unverified Commit be91ed15 authored by databasedav's avatar databasedav Committed by GitHub
Browse files

public import cosmic text (#158)

* public import cosmic_text

* fmt
parent 821c5762
No related branches found
No related tags found
No related merge requests found
use bevy::{prelude::*, window::PrimaryWindow}; use bevy::{prelude::*, window::PrimaryWindow};
use bevy_cosmic_edit::*; use bevy_cosmic_edit::{
cosmic_text::{Attrs, Family, Metrics},
*,
};
fn setup( fn setup(
mut commands: Commands, mut commands: Commands,
......
use bevy::prelude::*; use bevy::prelude::*;
use bevy_cosmic_edit::*; use bevy_cosmic_edit::{
cosmic_text::{Attrs, Family, Metrics},
*,
};
fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) { fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) {
let camera_bundle = Camera2dBundle { let camera_bundle = Camera2dBundle {
......
use bevy::prelude::*; use bevy::prelude::*;
use bevy_cosmic_edit::*; use bevy_cosmic_edit::{
cosmic_text::{Attrs, AttrsOwned, Metrics},
*,
};
#[derive(Resource)] #[derive(Resource)]
struct TextChangeTimer(pub Timer); struct TextChangeTimer(pub Timer);
......
#![allow(clippy::type_complexity)] #![allow(clippy::type_complexity)]
use bevy::prelude::*; use bevy::prelude::*;
use bevy_cosmic_edit::*; use bevy_cosmic_edit::{
cosmic_text::{Attrs, Family, Metrics},
*,
};
fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) { fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) {
commands.spawn(Camera2dBundle::default()); commands.spawn(Camera2dBundle::default());
......
use bevy::prelude::*; use bevy::prelude::*;
use bevy_cosmic_edit::*; use bevy_cosmic_edit::{
cosmic_text::{Attrs, AttrsOwned},
*,
};
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) { fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn(Camera2dBundle::default()); commands.spawn(Camera2dBundle::default());
......
use bevy::{prelude::*, window::PrimaryWindow}; use bevy::{prelude::*, window::PrimaryWindow};
use bevy_cosmic_edit::*; use bevy_cosmic_edit::{
cosmic_text::{Attrs, Family, Metrics},
*,
};
fn setup( fn setup(
mut commands: Commands, mut commands: Commands,
......
use bevy::prelude::*; use bevy::prelude::*;
use bevy_cosmic_edit::*; use bevy_cosmic_edit::{cosmic_text::Attrs, *};
fn setup(mut commands: Commands) { fn setup(mut commands: Commands) {
commands.spawn(Camera2dBundle::default()); commands.spawn(Camera2dBundle::default());
......
use bevy::prelude::*; use bevy::prelude::*;
use bevy_cosmic_edit::*; use bevy_cosmic_edit::{
cosmic_text::{Attrs, Family, Metrics},
*,
};
fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) { fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) {
let camera_bundle = Camera2dBundle { let camera_bundle = Camera2dBundle {
......
use bevy::prelude::*; use bevy::prelude::*;
use bevy_cosmic_edit::*; use bevy_cosmic_edit::{
cosmic_text::{Attrs, Family, Metrics},
*,
};
fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) { fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) {
commands.spawn(Camera2dBundle::default()); commands.spawn(Camera2dBundle::default());
......
use bevy::prelude::*; use bevy::prelude::*;
use bevy_cosmic_edit::*; use bevy_cosmic_edit::{
cosmic_text::{Attrs, AttrsOwned},
*,
};
fn setup(mut commands: Commands) { fn setup(mut commands: Commands) {
commands.spawn(Camera2dBundle::default()); commands.spawn(Camera2dBundle::default());
......
use crate::*; use crate::*;
use bevy::{prelude::*, window::PrimaryWindow}; use bevy::{prelude::*, window::PrimaryWindow};
use cosmic_text::{Attrs, AttrsOwned, Buffer, Edit, FontSystem, Metrics, Shaping};
/// Set of all buffer setup functions. Runs in [`First`] /// Set of all buffer setup functions. Runs in [`First`]
#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)] #[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
......
use crate::*; use crate::*;
use bevy::prelude::*; use bevy::prelude::*;
use cosmic_text::{Attrs, AttrsOwned, Editor, FontSystem};
/// Enum representing text wrapping in a cosmic [`Buffer`] /// Enum representing text wrapping in a cosmic [`Buffer`]
#[derive(Clone, Component, PartialEq, Default)] #[derive(Clone, Component, PartialEq, Default)]
......
...@@ -102,11 +102,7 @@ use bevy::prelude::*; ...@@ -102,11 +102,7 @@ use bevy::prelude::*;
pub use buffer::*; pub use buffer::*;
pub use cosmic_edit::*; pub use cosmic_edit::*;
#[doc(no_inline)] #[doc(no_inline)]
pub use cosmic_text::{ pub use cosmic_text::{self, Color as CosmicColor, Style as FontStyle, Weight as FontWeight};
Action, Attrs, AttrsOwned, Buffer, CacheKeyFlags, Color as CosmicColor, Cursor, Edit, Editor,
Family, FamilyOwned, FontSystem, Metrics, Shaping, Stretch, Style as FontStyle,
Weight as FontWeight,
};
pub use cursor::*; pub use cursor::*;
pub use events::*; pub use events::*;
pub use focus::*; pub use focus::*;
...@@ -205,7 +201,7 @@ impl Default for CosmicFontConfig { ...@@ -205,7 +201,7 @@ impl Default for CosmicFontConfig {
} }
} }
fn create_cosmic_font_system(cosmic_font_config: CosmicFontConfig) -> FontSystem { fn create_cosmic_font_system(cosmic_font_config: CosmicFontConfig) -> cosmic_text::FontSystem {
let locale = sys_locale::get_locale().unwrap_or_else(|| String::from("en-US")); let locale = sys_locale::get_locale().unwrap_or_else(|| String::from("en-US"));
let mut db = cosmic_text::fontdb::Database::new(); let mut db = cosmic_text::fontdb::Database::new();
if let Some(dir_path) = cosmic_font_config.fonts_dir_path.clone() { if let Some(dir_path) = cosmic_font_config.fonts_dir_path.clone() {
...@@ -234,13 +230,10 @@ mod tests { ...@@ -234,13 +230,10 @@ mod tests {
mut commands: Commands, mut commands: Commands,
mut font_system: ResMut<CosmicFontSystem>, mut font_system: ResMut<CosmicFontSystem>,
) { ) {
let attrs = Attrs::new(); let attrs = cosmic_text::Attrs::new();
commands.spawn(CosmicEditBundle { commands.spawn(CosmicEditBundle {
buffer: CosmicBuffer::new(&mut font_system, Metrics::new(20., 20.)).with_rich_text( buffer: CosmicBuffer::new(&mut font_system, cosmic_text::Metrics::new(20., 20.))
&mut font_system, .with_rich_text(&mut font_system, vec![("Blah", attrs)], attrs),
vec![("Blah", attrs)],
attrs,
),
..Default::default() ..Default::default()
}); });
} }
......
use crate::*; use crate::*;
use bevy::prelude::*; use bevy::prelude::*;
use cosmic_text::Edit;
pub(crate) struct UserSelectPlugin; pub(crate) struct UserSelectPlugin;
......
// Common functions for examples // Common functions for examples
use crate::*; use crate::*;
use bevy::{prelude::*, window::PrimaryWindow}; use bevy::{prelude::*, window::PrimaryWindow};
use cosmic_text::Edit;
/// Trait for adding color conversion from [`bevy::prelude::Color`] to [`cosmic_text::Color`] /// Trait for adding color conversion from [`bevy::prelude::Color`] to [`cosmic_text::Color`]
pub trait ColorExtras { pub trait ColorExtras {
......
use crate::*; use crate::*;
use bevy::{prelude::*, window::PrimaryWindow}; use bevy::{prelude::*, window::PrimaryWindow};
use cosmic_text::Affinity; use cosmic_text::Affinity;
use cosmic_text::Edit;
/// System set for cosmic text layout systems. Runs in [`PostUpdate`] /// System set for cosmic text layout systems. Runs in [`PostUpdate`]
#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)] #[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment