Skip to content

Commit

Permalink
Fixes after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
farmaazon committed Jul 1, 2022
1 parent 15c55bc commit 05102d0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions app/gui/view/component-browser/searcher-list-panel/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ use ensogl_core::display::object::ObjectOps;
use ensogl_core::display::scene::Layer;
use ensogl_core::display::shape::StyleWatchFrp;
use ensogl_core::display::style;
use ensogl_derive_theme::FromTheme;
use ensogl_core::Animation;
use ensogl_derive_theme::FromTheme;
use ensogl_gui_component::component;
use ensogl_hardcoded_theme::application::component_browser::searcher as searcher_theme;
use ensogl_list_view as list_view;
Expand Down Expand Up @@ -736,7 +736,7 @@ impl component::Frp<Model> for Frp {
output.is_header_selected <+ groups.is_header_selected;
output.header_accepted <+ groups.header_accepted;

output.size <+ layout_update.map(|style| style.size_inner());
output.size <+ layout_frp.update.map(|style| style.size_inner());

selection_size_animation.target <+ groups.selection_size._1();
selection_animation.target <+ groups.selection_position_target.all_with(
Expand All @@ -747,7 +747,7 @@ impl component::Frp<Model> for Frp {
eval selection_size_animation.value ((pos) selection.size.set(*pos));
eval_ model.scroll_area.scroll_position_y(selection_animation.skip.emit(()));
}
layout_frp.init.emit(())
layout_frp.init.emit(());
selection_animation.skip.emit(());
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/rust/ensogl/component/text/msdf-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ mod msdfgen_wasm {
/// Patches downloaded msdfgen_wasm.js file.
///
/// For some reason, for wasm-bindgen test on browsers the function must be explicitly exported.
/// Examples works without this perfectly.
/// Examples work without this perfectly.
pub fn patch_for_wasm_bindgen_test() {
let path = path::Path::new(&PACKAGE.filename);
let mut open_options = fs::OpenOptions::new();
Expand Down

0 comments on commit 05102d0

Please sign in to comment.