Skip to content

Implement update_colors #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keavon merged 1 commit into from
Mar 26, 2021
Merged

Implement update_colors #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/web/wasm/src/viewport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@ pub fn on_mouse_move(x: u32, y: u32) {
/// Update working colors
#[wasm_bindgen]
pub fn update_colors(primary_color: Color, secondary_color: Color) {
todo!()
let tool_state = unsafe { &mut TOOL_STATE };
tool_state.set_primary_color(primary_color.get_inner_color());
tool_state.set_secondary_color(secondary_color.get_inner_color());
}
6 changes: 6 additions & 0 deletions client/web/wasm/src/wrappers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ impl Color {
}
}

impl Color {
pub fn get_inner_color(&self) -> InnerColor {
self.0
}
}

pub fn translate_tool(name: &str) -> Option<ToolType> {
match name {
"Select" => Some(ToolType::Select),
Expand Down
6 changes: 6 additions & 0 deletions core/editor/src/tools/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ impl ToolState {
pub fn select_tool(&mut self, tool: ToolType) {
self.active_tool = tool
}
pub fn set_primary_color<T: Into<Color>>(&mut self, primary_color: T) {
self.primary_color = primary_color.into();
}
pub fn set_secondary_color<T: Into<Color>>(&mut self, secondary_color: T) {
self.secondary_color = secondary_color.into();
}
}

#[repr(usize)]
Expand Down