Working table example

Author: fschutt

azul-desktop/src/wr_translate.rs

@@ -1314,12 +1314,10 @@ pub(crate) fn wr_translate_external_scroll_id(scroll_id: ExternalScrollId) -> Wr
 }
 
 pub(crate) fn wr_translate_display_list(input: CachedDisplayList, pipeline_id: PipelineId) -> WrBuiltDisplayList {
-    println!("{:#?}", input);
     let root_space_and_clip = WrSpaceAndClipInfo::root_scroll(wr_translate_pipeline_id(pipeline_id));
     let mut positioned_items = Vec::new();
     let mut builder = WrDisplayListBuilder::new(wr_translate_pipeline_id(pipeline_id));
     push_display_list_msg(&mut builder, input.root, root_space_and_clip.spatial_id, root_space_and_clip.clip_id, &mut positioned_items);
-    builder.dump_serialized_display_list();
     let (_pipeline_id, built_display_list) = builder.finalize();
     built_display_list
 }
@@ -1407,7 +1405,7 @@ fn push_frame(
     parent_clip_id: WrClipId,
     positioned_items: &mut Vec<(WrSpatialId, WrClipId)>
 ) {
-    let clip_rect = get_frame_clip_rect(frame.position, frame.size);
+    let clip_rect = LogicalRect::new(LogicalPosition::zero(), frame.size); // get_frame_clip_rect(frame.position, frame.size);
 
     for item in frame.content {
         push_display_list_content(
@@ -1432,17 +1430,6 @@ fn push_frame(
     }
 }
 
-fn get_frame_clip_rect(position_info: PositionInfo, rect_size: LogicalSize) -> LogicalRect {
-    match position_info {
-        PositionInfo::Static { x_offset, y_offset, .. } |
-        PositionInfo::Relative { x_offset, y_offset, .. } |
-        PositionInfo::Absolute { x_offset, y_offset, .. } |
-        PositionInfo::Fixed { x_offset, y_offset, .. } => {
-            LogicalRect::new(LogicalPosition::new(x_offset, y_offset), rect_size)
-        }
-    }
-}
-
 #[inline]
 fn push_scroll_frame(
     builder: &mut WrDisplayListBuilder,
@@ -1458,7 +1445,7 @@ fn push_scroll_frame(
         ComplexClipRegion as WrComplexClipRegion,
     };
 
-    let clip_rect = get_frame_clip_rect(scroll_frame.frame.position, scroll_frame.frame.size);
+    let clip_rect = LogicalRect::new(LogicalPosition::zero(), scroll_frame.frame.size);
 
     // if let Some(image_mask) = scroll_frame.frame.image_mask { push_image_mask_clip() }
 

azul-widgets/src/table_view.rs

@@ -207,7 +207,7 @@ impl TableViewState {
             Normal(CssProperty::background_content(StyleBackgroundContentVec::from_const_slice(COLOR_E6E6E6_BACKGROUND))),
             Normal(CssProperty::flex_direction(LayoutFlexDirection::Column)),
             Normal(CssProperty::box_shadow_right(SHADOW)),
-            // Normal(CssProperty::transform(StyleTransformVec::from_const_slice(TEST_TRANSFORM))),
+            Normal(CssProperty::transform(StyleTransformVec::from_const_slice(TEST_TRANSFORM))),
         ];
         static ROW_NUMBERS_CONTAINER_CLASS: &[IdOrClass] = &[
             IdOrClass::Class(AzString::from_const_str("az-table-row-numbers-container"))
@@ -257,8 +257,6 @@ impl TableViewState {
         .with_inline_css_props(NodeDataInlineCssPropertyVec::from_const_slice(ROW_NUMBER_WRAPPER_STYLE))
         .with_children(AzDomVec::from(vec![top_left_empty_rect, row_numbers]));
 
-        return row_number_wrapper; // DEBUG
-
         static ACTIVE_SELECTION_HANDLE_STYLE: &[NodeDataInlineCssProperty] = &[
             Normal(CssProperty::position(LayoutPosition::Absolute)),
             Normal(CssProperty::width(LayoutWidth::const_px(10))),

examples/rust/public.rs

@@ -38,15 +38,7 @@ const DOM: Dom = Dom {
 const CSS: &str = "body { font-size: 50px; } body:hover { color: red; }";
 
 extern "C" fn layout(data: &mut RefAny, _info: LayoutInfo) -> StyledDom {
-
-    let styled_dom = StyledDom::from_file("./ui.xml".into());
-    /*DOM.style(Css::from_string(CSS.into()));*/
-
-    if let OptionFile::Some(mut file) = File::create("./debug.html".into()) {
-        file.write_string(styled_dom.get_html_string().as_refstr());
-    }
-
-    styled_dom
+    StyledDom::from_file("./ui.xml".into())
 }
 
 fn main() {