Skip to content

Commit

Permalink
Update to have Bitmap Emoji support
Browse files Browse the repository at this point in the history
  • Loading branch information
DJMcNab committed Jul 26, 2024
1 parent cf85a35 commit e156a11
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
7 changes: 4 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ xilem_web_core = { version = "0.1.0", path = "xilem_web/xilem_web_core" }
masonry = { version = "0.2.0", path = "masonry" }
xilem_core = { version = "0.1.0", path = "xilem_core" }
# We depend on this Vello revision for Emoji support (https://github.com/linebender/vello/pull/615)
vello = { git = "https://github.com/linebender/vello/", rev = "3ee3bea02164c5a816fe6c16ef4e3a810edb7620" }
vello = { git = "https://github.com/DJMcNab/vello/", rev = "010e16061126b3c456f66360c483c2e60ec92d28" }
wgpu = "0.20.1"
kurbo = "0.11.0"
parley = "0.1.0"
Expand Down
2 changes: 1 addition & 1 deletion masonry/src/text/layout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use kurbo::{Affine, Line, Point, Rect, Size};
use parley::context::RangedBuilder;
use parley::fontique::{Style, Weight};
use parley::layout::{Alignment, Cursor};
use parley::style::{Brush as BrushTrait, FontFamily, FontStack, GenericFamily, StyleProperty};
use parley::style::{FontFamily, FontStack, GenericFamily, StyleProperty};
use parley::{FontContext, Layout, LayoutContext};
use vello::peniko::{self, Color, Gradient};
use vello::Scene;
Expand Down
4 changes: 2 additions & 2 deletions xilem/examples/emoji_picker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
use xilem::{
core::map_state,
view::{button, flex, label, prose, sized_box},
AnyWidgetView, Axis, Color, EventLoop, EventLoopBuilder, WidgetView, Xilem,
view::{button, flex, label, prose, sized_box, Axis},
AnyWidgetView, Color, EventLoop, EventLoopBuilder, WidgetView, Xilem,
};

fn app_logic(data: &mut EmojiPagination) -> impl WidgetView<EmojiPagination> {
Expand Down
4 changes: 2 additions & 2 deletions xilem_core/examples/filesystem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ impl<State, Action> View<State, Action, ViewCtx> for File {
) -> Mut<'el, Self::Element> {
if prev.name != self.name {
let new_path = ctx.current_folder_path.join(&*self.name);
let _ = std::fs::rename(&element, &new_path);
let _ = std::fs::rename(&*element, &new_path);
*element = new_path;
}
if self.contents != prev.contents {
let _ = std::fs::write(&element, self.contents.as_bytes());
let _ = std::fs::write(&*element, self.contents.as_bytes());
}
element
}
Expand Down

0 comments on commit e156a11

Please sign in to comment.