feat(ui): take pal::Wm as a parameter in Entry[Core]::new

It turned out to be necessary when implementing `Entry[Core]::set_text`.
yvt · May 23, 2020 · 3431538 · 3431538
1 parent e030e9c
commit 3431538
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 83 deletions.
diff --git a/stella2/meta/lib.tcwdl b/stella2/meta/lib.tcwdl
@@ -118,9 +118,7 @@ comp crate::view::MainView {
         child_generic = get!(&search_bar_entry),
     };
 
-    const search_bar_entry = EntryCore::new! {
-        style_manager,
-    };
+    const search_bar_entry = EntryCore::new! { wm, style_manager };
 
     const channel_list_wrap = StyledBox::new! {
         style_manager,

diff --git a/tcw3/examples/tcw3_widgets.rs b/tcw3/examples/tcw3_widgets.rs
@@ -169,7 +169,7 @@ fn main() {
         view
     };
 
-    let entry = Entry::new(style_manager);
+    let entry = Entry::new(wm, style_manager);
 
     let button = Button::new(style_manager);
     button.set_caption("Please don't touch this button");

diff --git a/tcw3/meta/views/entry.tcwdl b/tcw3/meta/views/entry.tcwdl
@@ -4,6 +4,7 @@ use crate::{ui::theming::{ClassSet, StyledBox, HElem, Manager}, uicore::HView};
 #[widget]
 #[builder(simple)]
 pub comp crate::ui::views::Entry {
+    const wm: crate::pal::Wm { pub set; }
     const style_manager: &Manager { pub set; }
 
     prop class_set: ClassSet { pub set; get clone; } = ?;
@@ -18,6 +19,7 @@ pub comp crate::ui::views::Entry {
 #[widget]
 #[builder(simple)]
 pub comp crate::ui::views::EntryCore {
+    const wm: crate::pal::Wm { pub set; }
     const style_manager: &Manager { pub set; }
 
     const view: HView { pub get clone; } = ?;