Positions as i32

Author: jakmeier

CHANGES.md

@@ -0,0 +1,2 @@
+## Unreleased (v0.4)
+- (breaking) Changed type of positions from `u32` to `i32` (for pane and global frame). Negative offsets are valid and sometimes necessary.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "div"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Jakob Meier <[email protected]>"]
 edition = "2018"
 license = "MIT/Apache-2.0"

src/div_handle.rs

@@ -28,7 +28,7 @@ impl DivHandle {
     ///
     /// The provided parameters are taken in the original scale when initializing,
     /// taking any calls to the global div::resize() into consideration.
-    pub fn reposition(&self, x: u32, y: u32) -> Result<(), DivError> {
+    pub fn reposition(&self, x: i32, y: i32) -> Result<(), DivError> {
         state::exec_mut(|state| state.update_pane(&self, Some(x), Some(y), None, None))
     }
     /// Adjust the size of the div.
@@ -43,7 +43,7 @@ impl DivHandle {
     ///
     /// The provided parameters are taken in the original scale when initializing,
     /// taking any calls to the global div::resize() into consideration.
-    pub fn reposition_and_resize(&self, x: u32, y: u32, w: u32, h: u32) -> Result<(), DivError> {
+    pub fn reposition_and_resize(&self, x: i32, y: i32, w: u32, h: u32) -> Result<(), DivError> {
         state::exec_mut(|state| state.update_pane(&self, Some(x), Some(y), Some(w), Some(h)))
     }
     /// Set CSS property of div

src/global.rs

@@ -4,7 +4,7 @@ use super::*;
 ///
 /// The position of all existing div is changed immediately, regardless of active / inactive status.
 /// if div::init() has been used instead of div::init_ex(...), the default origin is (0,0).
-pub fn reposition(x: u32, y: u32) -> Result<(), DivError> {
+pub fn reposition(x: i32, y: i32) -> Result<(), DivError> {
     state::exec_mut(|state| state.global_reposition(x, y))
 }
 

src/lib.rs

@@ -42,7 +42,7 @@ pub fn init_to(id: &str) -> Result<(), DivError> {
 /// ```
 pub fn init_ex_with_element(
     root: Element,
-    pos: (u32, u32),
+    pos: (i32, i32),
     size: Option<(u32, u32)>,
 ) -> Result<(), DivError> {
     state::set_state(GlobalState {
@@ -69,7 +69,7 @@ pub fn init_ex_with_element(
 /// ```
 pub fn init_ex(
     id: Option<&str>,
-    pos: (u32, u32),
+    pos: (i32, i32),
     size: Option<(u32, u32)>,
 ) -> Result<(), DivError> {
     let root = get_root(id)?;
@@ -89,7 +89,7 @@ fn get_root(id: Option<&str>) -> Result<Element, DivError> {
 
 /// Creates a new div at the defined position with the given HTML as content.
 /// Use the returned DivHandle to manipulate the div.
-pub fn new(x: u32, y: u32, w: u32, h: u32, html: &str) -> Result<DivHandle, DivError> {
+pub fn new(x: i32, y: i32, w: u32, h: u32, html: &str) -> Result<DivHandle, DivError> {
     let css = "";
     let classes = "";
     state::exec_mut(|state| state.new_pane(x, y, w, h, html, css, classes))
@@ -117,8 +117,8 @@ pub fn new(x: u32, y: u32, w: u32, h: u32, html: &str) -> Result<DivHandle, DivE
 /// ).unwrap();
 /// ```
 pub fn new_styled<'a, C, CSS, S1, S2, S3>(
-    x: u32,
-    y: u32,
+    x: i32,
+    y: i32,
     w: u32,
     h: u32,
     html: &str,
@@ -155,8 +155,8 @@ where
 /// The most direct way would be to use `wasm_bindgen_futures::spawn_local`
 /// ## Example
 /// ```rust
-/// const X: u32 = 100;
-/// const Y: u32 = 100;
+/// const X: i32 = 100;
+/// const Y: i32 = 100;
 /// const W: u32 = 500;
 /// const H: u32 = 500;
 /// let future = async {
@@ -186,8 +186,8 @@ pub fn load_js_classes(
 
 /// Creates a new div and fills it with a JS class.
 pub fn from_js_class(
-    x: u32,
-    y: u32,
+    x: i32,
+    y: i32,
     w: u32,
     h: u32,
     class_handle: JsClassHandle,

src/pane.rs

@@ -13,8 +13,8 @@ use web_sys::HtmlElement;
 pub(crate) struct Pane {
     node: HtmlElement,
     displayed: bool,
-    x: u32,
-    y: u32,
+    x: i32,
+    y: i32,
     w: u32,
     h: u32,
 }
@@ -23,8 +23,8 @@ impl<PS: PaneStorage, CS: ClassStorage> GlobalState<PS, CS> {
     /// Creates a new pane from specified html and shows it
     pub(crate) fn new_pane(
         &mut self,
-        x: u32,
-        y: u32,
+        x: i32,
+        y: i32,
         w: u32,
         h: u32,
         html: &str,
@@ -95,8 +95,8 @@ impl<PS: PaneStorage, CS: ClassStorage> GlobalState<PS, CS> {
     pub(crate) fn update_pane(
         &mut self,
         pane_handle: &DivHandle,
-        x: Option<u32>,
-        y: Option<u32>,
+        x: Option<i32>,
+        y: Option<i32>,
         w: Option<u32>,
         h: Option<u32>,
     ) -> Result<(), DivError> {
@@ -108,7 +108,7 @@ impl<PS: PaneStorage, CS: ClassStorage> GlobalState<PS, CS> {
         v.redraw(self.pos, self.zoom)?;
         Ok(())
     }
-    pub(crate) fn global_reposition(&mut self, x: u32, y: u32) -> Result<(), DivError> {
+    pub(crate) fn global_reposition(&mut self, x: i32, y: i32) -> Result<(), DivError> {
         self.pos = (x, y);
         self.nodes.for_each(&|pane: &mut Pane| {
             let el = pane.get_element()?;
@@ -142,9 +142,9 @@ impl Pane {
     pub(crate) fn get_element(&self) -> Result<&HtmlElement, DivError> {
         Ok(&self.node)
     }
-    pub(crate) fn redraw(&self, (x, y): (u32, u32), (fx, fy): (f32, f32)) -> Result<(), DivError> {
-        let x = x + (fx * self.x as f32) as u32;
-        let y = y + (fy * self.y as f32) as u32;
+    pub(crate) fn redraw(&self, (x, y): (i32, i32), (fx, fy): (f32, f32)) -> Result<(), DivError> {
+        let x = x + (fx * self.x as f32) as i32;
+        let y = y + (fy * self.y as f32) as i32;
         let w = (fx * self.w as f32) as u32;
         let h = (fy * self.h as f32) as u32;
 

src/state.rs

@@ -5,7 +5,7 @@ where
     CS: ClassStorage,
 {
     pub(crate) root: web_sys::Element,
-    pub(crate) pos: (u32, u32),
+    pub(crate) pos: (i32, i32),
     pub(crate) size: Option<(u32, u32)>,
     pub(crate) zoom: (f32, f32),
     pub(crate) nodes: PS,