code/alchemy
Archived
1
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Ongoing work on supporting GTK, had to rework some concepts due to the way gtk-rs works.

Browse source
This commit is contained in:
Ryan McGrath 2019-06-08 13:56:39 -07:00
parent f15cf258af
commit 0d8a14ce67
No known key found for this signature in database
GPG key ID: 811674B62B666830
20 changed files with 378 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lifecycle/Cargo.toml
View file

@ -10,10 +10,13 @@ categories = ["gui", "rendering::engine", "multimedia"]
keywords = ["gui", "css", "styles", "layout", "ui"]
[features]
default = []
cocoa = ["objc", "objc_id"]
gtkrs = ["gtk"]
[dependencies]
alchemy-styles = { version = "0.1", path = "../styles" }
gtk = { version = "0.6.0", features = ["v3_16"], optional = true }
objc = { version = "0.2.6", optional = true }
objc_id = { version = "0.1.1", optional = true }
serde_json = "1"

2
lifecycle/src/reconciler/mod.rs
View file

@ -114,7 +114,7 @@ impl RenderEngine {
width: Dimension::Points(dimensions.0 as f32),
height: Dimension::Points(dimensions.1 as f32)
};
layout_store.set_style(layout, style);
layout_store.set_style(layout, style)?;
layout
};

9
lifecycle/src/traits.rs
View file

@ -15,8 +15,9 @@ use crate::rsx::RSX;
pub type PlatformSpecificNodeType = objc_id::ShareId<objc::runtime::Object>;
/// A per-platform wrapped Pointer type, used for attaching views/widgets.
#[cfg(not(feature = "cocoa"))]
#[cfg(feature = "gtkrs")]
pub type PlatformSpecificNodeType = ();
//pub type PlatformSpecificNodeType = gtk::WidgetExt;
/*fn update<C: Component, F: Fn() -> Box<C> + Send + Sync + 'static>(component: &Component, updater: F) {
let component_ptr = component as *const C as usize;
@ -26,7 +27,7 @@ pub type PlatformSpecificNodeType = ();
/// Each platform tends to have their own startup routine, their own runloop, and so on.
/// Alchemy recognizes this and provides an `AppDelegate` that receives events at a system
/// level and allows the user to operate within the established framework per-system.
pub trait AppDelegate: Send + Sync {
pub trait AppDelegate {
/// Fired when an Application is about to finish launching.
fn will_finish_launching(&mut self) {}
@ -61,7 +62,7 @@ pub trait AppDelegate: Send + Sync {
/// Each platform has their own `Window` API, which Alchemy attempts to pair down to one consistent
/// API. This also acts as the bootstrapping point for a `render` tree.
pub trait WindowDelegate: Send + Sync {
pub trait WindowDelegate {
/// Fired when this Window will close. You can use this to clean up or destroy resources,
/// timers, and other things.
fn will_close(&mut self) { }
@ -169,7 +170,7 @@ pub trait Component: Props + Send + Sync {
/// lifecycle methods instead. Keeping `render()` pure makes components easier to think about.
///
/// This method is not called if should_component_update() returns `false`.
fn render(&self, children: Vec<RSX>) -> Result<RSX, Error> { Ok(RSX::None) }
fn render(&self, _children: Vec<RSX>) -> Result<RSX, Error> { Ok(RSX::None) }
/// This lifecycle is invoked after an error has been thrown by a descendant component. It receives
/// the error that was thrown as a parameter and should return a value to update state.