Merge from Develop

benchmark/benches/size_probe_benchmark.rs

@@ -46,7 +46,7 @@ impl ObjectImpl for TestWidget {}
 impl WidgetImpl for TestWidget {}
 
 impl TestWidget {
-    pub fn new() -> Box<Self> {
-        Object::new(&[])
+    pub fn new() -> Tr<Self> {
+        Self::new_alloc()
     }
 }

examples/async_task/async_task_widget.rs

@@ -89,7 +89,7 @@ impl WidgetImpl for AsyncTaskWidget {}
 
 impl AsyncTaskWidget {
     #[inline]
-    pub fn new() -> Box<Self> {
-        Object::new(&[])
+    pub fn new() -> Tr<Self> {
+        Self::new_alloc()
     }
 }

examples/border/main.rs

@@ -16,8 +16,8 @@ fn main() {
 
 fn build_ui(window: &mut ApplicationWindow) {
     let mut hbox = HBox::new();
-    let mut widget1: Box<Widget> = Object::new(&[]);
-    let mut widget2: Box<Widget> = Object::new(&[]);
+    let mut widget1 = Widget::new_alloc();
+    let mut widget2 = Widget::new_alloc();
 
     widget1.set_background(Color::CYAN);
     widget1.width_request(400);

examples/box_layout/hbox_layout.rs

@@ -6,13 +6,13 @@ use tmui::{label::Label, prelude::*};
 #[derive(Childrenable)]
 pub struct HBoxLayout {
     #[children]
-    label_1: Box<Label>,
+    label_1: Tr<Label>,
 
     #[children]
-    label_2: Box<Label>,
+    label_2: Tr<Label>,
 
     #[children]
-    label_3: Box<Label>,
+    label_3: Tr<Label>,
 }
 
 impl ObjectSubclass for HBoxLayout {

examples/box_layout/vbox_layout.rs

@@ -8,13 +8,13 @@ use crate::hbox_layout::HBoxLayout;
 #[derive(Childrenable)]
 pub struct VBoxLayout {
     #[children]
-    hbox_1: Box<HBoxLayout>,
+    hbox_1: Tr<HBoxLayout>,
 
     #[children]
-    hbox_2: Box<HBoxLayout>,
+    hbox_2: Tr<HBoxLayout>,
 
     #[children]
-    hbox_3: Box<HBoxLayout>,
+    hbox_3: Tr<HBoxLayout>,
 }
 
 impl ObjectSubclass for VBoxLayout {
@@ -39,7 +39,7 @@ impl ObjectImpl for VBoxLayout {
 impl WidgetImpl for VBoxLayout {}
 
 impl VBoxLayout {
-    pub fn new() -> Box<Self> {
-        Object::new(&[])
+    pub fn new() -> Tr<Self> {
+        Self::new_alloc()
     }
 }

examples/box_shadow/main.rs

@@ -18,7 +18,7 @@ fn main() {
 }
 
 fn build_ui(window: &mut ApplicationWindow) {
-    let mut widget: Box<Widget> = Object::new(&[]);
+    let mut widget = Widget::new_alloc();
     widget.width_request(400);
     widget.height_request(200);
     widget.set_hexpand(true);

examples/child_attr_widget/child_attr_widget.rs

@@ -9,7 +9,7 @@ use tmui::{
 #[derive(Childable)]
 pub struct ChildAttrWidget {
     #[child]
-    label: Box<Label>,
+    label: Tr<Label>,
 }
 
 impl ObjectSubclass for ChildAttrWidget {
@@ -28,7 +28,7 @@ impl ObjectImpl for ChildAttrWidget {
 impl WidgetImpl for ChildAttrWidget {}
 
 impl ChildAttrWidget {
-    pub fn new() -> Box<Self> {
-        Object::new(&[])
+    pub fn new() -> Tr<Self> {
+        Self::new_alloc()
     }
 }

examples/complex_layout/ctx_menu.rs

@@ -15,7 +15,7 @@ use tmui::{
 #[derive(Childable)]
 pub struct CtxMenu {
     #[child]
-    list: Box<ListView>,
+    list: Tr<ListView>,
 }
 
 impl ObjectSubclass for CtxMenu {
@@ -75,8 +75,8 @@ impl PopupImpl for CtxMenu {
 
 impl CtxMenu {
     #[inline]
-    pub fn new() -> Box<Self> {
-        Object::new(&[])
+    pub fn new() -> Tr<Self> {
+        Self::new_alloc()
     }
 }
 

examples/complex_layout/layouts/central_panel.rs

@@ -10,10 +10,10 @@ use super::{right_panel::RightPanel, LeftPanel};
 #[derive(Childrenable)]
 pub struct CentralPanel {
     #[children]
-    widget1: Box<LeftPanel>,
+    widget1: Tr<LeftPanel>,
 
     #[children]
-    widget2: Box<RightPanel>,
+    widget2: Tr<RightPanel>,
 }
 
 impl ObjectSubclass for CentralPanel {
@@ -33,4 +33,4 @@ impl ObjectImpl for CentralPanel {
     }
 }
 
-impl WidgetImpl for CentralPanel {}
+impl WidgetImpl for CentralPanel {}

examples/complex_layout/layouts/left_panel.rs

@@ -10,10 +10,10 @@ use super::{ActivityBar, WorkspacePanel};
 #[derive(Childrenable)]
 pub struct LeftPanel {
     #[children]
-    activity_bar: Box<ActivityBar>,
+    activity_bar: Tr<ActivityBar>,
 
     #[children]
-    workspace_panel: Box<WorkspacePanel>,
+    workspace_panel: Tr<WorkspacePanel>,
 }
 
 impl ObjectSubclass for LeftPanel {
@@ -38,4 +38,4 @@ impl LeftPanel {
             self.show()
         }
     }
-}
+}

examples/complex_layout/layouts/right_panel/mod.rs

@@ -13,7 +13,7 @@ use self::split_pane::MySplitPane;
 #[derive(Childrenable)]
 pub struct RightPanel {
     #[children]
-    split_pane: Box<MySplitPane>,
+    split_pane: Tr<MySplitPane>,
 }
 
 impl ObjectSubclass for RightPanel {
@@ -27,4 +27,4 @@ impl ObjectImpl for RightPanel {
     }
 }
 
-impl WidgetImpl for RightPanel {}
+impl WidgetImpl for RightPanel {}

examples/complex_layout/layouts/right_panel/split_pane.rs

@@ -28,12 +28,12 @@ impl ObjectImpl for MySplitPane {
         self.set_hexpand(true);
         self.set_vexpand(true);
 
-        let mut widget: Box<MyStack> = Object::new(&[]);
+        let mut widget = MyStack::new_alloc();
         widget.set_background(Color::CYAN);
         widget.set_vexpand(true);
         widget.set_hexpand(true);
 
-        let mut scroll_area: Box<ScrollArea> = Object::new(&[]);
+        let mut scroll_area = ScrollArea::new_alloc();
         scroll_area.set_scroll_bar_position(ScrollBarPosition::End);
         scroll_area.set_orientation(Orientation::Vertical);
         scroll_area.set_hexpand(true);

examples/complex_layout/layouts/right_panel/stack.rs

@@ -1,15 +1,18 @@
 use tmui::{
-    label::Label, prelude::*, tlib::object::{ObjectImpl, ObjectSubclass}, widget::WidgetImpl
+    label::Label,
+    prelude::*,
+    tlib::object::{ObjectImpl, ObjectSubclass},
+    widget::WidgetImpl,
 };
 
 #[extends(Widget, Layout(Stack))]
 #[derive(Childrenable)]
 pub struct MyStack {
     #[children]
-    label_1: Box<Label>,
+    label_1: Tr<Label>,
 
     #[children]
-    label_2: Box<Label>,
+    label_2: Tr<Label>,
 }
 
 impl ObjectSubclass for MyStack {
@@ -29,4 +32,4 @@ impl ObjectImpl for MyStack {
     }
 }
 
-impl WidgetImpl for MyStack {}
+impl WidgetImpl for MyStack {}

examples/complex_layout/layouts/title_bar.rs

@@ -10,13 +10,13 @@ use super::{app_icon::AppIcon, WinCtrlBtns};
 #[derive(Childrenable)]
 pub struct TitleBar {
     #[children]
-    app_icon: Box<AppIcon>,
+    app_icon: Tr<AppIcon>,
 
     #[children]
-    widget2: Box<Widget>,
+    widget2: Tr<Widget>,
 
     #[children]
-    win_ctrl_btns: Box<WinCtrlBtns>
+    win_ctrl_btns: Tr<WinCtrlBtns>,
 }
 
 impl ObjectSubclass for TitleBar {
@@ -43,4 +43,4 @@ impl ObjectImpl for TitleBar {
     }
 }
 
-impl WidgetImpl for TitleBar {}
+impl WidgetImpl for TitleBar {}

examples/complex_layout/layouts/view.rs

@@ -12,13 +12,13 @@ use super::{CentralPanel, StatusBar, TitleBar};
 #[global_watch(MouseMove, MousePressed, MouseReleased)]
 pub struct View {
     #[children]
-    title_bar: Box<TitleBar>,
+    title_bar: Tr<TitleBar>,
 
     #[children]
-    central_panel: Box<CentralPanel>,
+    central_panel: Tr<CentralPanel>,
 
     #[children]
-    status_bar: Box<StatusBar>,
+    status_bar: Tr<StatusBar>,
 
     resize_zone: bool,
     resize_pressed: bool,
@@ -40,8 +40,8 @@ impl WidgetImpl for View {}
 
 impl View {
     #[inline]
-    pub fn new() -> Box<Self> {
-        Object::new(&[])
+    pub fn new() -> Tr<Self> {
+        Self::new_alloc()
     }
 }
 

examples/complex_layout/layouts/win_ctrl_btns.rs

@@ -14,22 +14,22 @@ pub struct WinCtrlBtns {
         SvgIcon::from_bytes(file.data.as_ref())
     }"))]
     #[children]
-    minimize: Box<SvgIcon>,
+    minimize: Tr<SvgIcon>,
 
     #[derivative(Default(value = "{
         let maximize = Asset::get(\"large.svg\").unwrap();
         let restore = Asset::get(\"restore.svg\").unwrap();
         SvgToggleIcon::from_bytes(&[maximize.data.as_ref(), restore.data.as_ref()])
     }"))]
     #[children]
-    large_restore: Box<SvgToggleIcon>,
+    large_restore: Tr<SvgToggleIcon>,
 
     #[derivative(Default(value = "{
         let file = Asset::get(\"close.svg\").unwrap();
         SvgIcon::from_bytes(file.data.as_ref())
     }"))]
     #[children]
-    close: Box<SvgIcon>,
+    close: Tr<SvgIcon>,
 }
 
 impl ObjectSubclass for WinCtrlBtns {

examples/complex_layout/layouts/workspace_panel.rs

@@ -20,7 +20,7 @@ impl ObjectImpl for WorkspacePanel {
     fn construct(&mut self) {
         self.parent_construct();
 
-        self.add_popup(CtxMenu::new());
+        self.add_popup(CtxMenu::new().to_dyn_popup_tr());
     }
 
     fn initialize(&mut self) {

examples/custom_diff_handle/my_diff_widget.rs

@@ -24,7 +24,7 @@ impl WidgetImpl for MyDiffWidget {}
 
 impl MyDiffWidget {
     #[inline]
-    pub fn new() -> Box<Self> {
-        Object::new(&[])
+    pub fn new() -> Tr<Self> {
+        Self::new_alloc()
     }
 }

examples/custom_diff_handle/my_split_pane.rs

@@ -28,7 +28,7 @@ impl WidgetImpl for MySplitPane {}
 
 impl MySplitPane {
     #[inline]
-    pub fn new() -> Box<Self> {
-        Object::new(&[])
+    pub fn new() -> Tr<Self> {
+        Self::new_alloc()
     }
-}
+}

examples/custom_popup/my_box.rs

@@ -9,10 +9,10 @@ use tmui::{
 #[derive(Childrenable)]
 pub struct MyBox {
     #[children]
-    content_widget: Box<Widget>,
+    content_widget: Tr<Widget>,
 
     #[children]
-    bottom_bar: Box<MyWidget>,
+    bottom_bar: Tr<MyWidget>,
 }
 
 impl ObjectSubclass for MyBox {
@@ -42,7 +42,7 @@ impl WidgetImpl for MyBox {}
 
 impl MyBox {
     #[inline]
-    pub fn new() -> Box<Self> {
-        Object::new(&[])
+    pub fn new() -> Tr<Self> {
+        Self::new_alloc()
     }
 }