| @@ -39,8 +39,9 @@ pub enum PanelSide { · 38 unmodified lines |
| 39 | | 39 | |
| 40 | use std::collections::HashSet; | 40 | use std::collections::HashSet; |
| 41 | | 41 | |
| 42 | // #[derive(Element)] | 42 | #[derive(Element)] |
| 43 | pub struct Panel { | 43 | pub struct Panel<S: 'static + Send + Sync> { |
| | 44 | state_type: PhantomData<S>, |
| 44 | scroll_state: ScrollState, | 45 | scroll_state: ScrollState, |
| 45 | current_side: PanelSide, | 46 | current_side: PanelSide, |
| 46 | /// Defaults to PanelAllowedSides::LeftAndRight | 47 | /// Defaults to PanelAllowedSides::LeftAndRight |
| @@ -51,7 +52,7 @@ pub struct Panel { · 4 unmodified lines |
| 51 | // payload: HackyChildrenPayload, | 52 | // payload: HackyChildrenPayload, |
| 52 | } | 53 | } |
| 53 | | 54 | |
| 54 | impl Panel { | 55 | impl<S: 'static + Send + Sync> Panel<S> { |
| 55 | pub fn new( | 56 | pub fn new( |
| 56 | scroll_state: ScrollState, | 57 | scroll_state: ScrollState, |
| 57 | // children: HackyChildren<S>, | 58 | // children: HackyChildren<S>, |
| @@ -60,6 +61,7 @@ impl Panel { · 2 unmodified lines |
| 60 | let token = token(); | 61 | let token = token(); |
| 61 | | 62 | |
| 62 | Self { | 63 | Self { |
| | 64 | state_type: PhantomData, |
| 63 | scroll_state, | 65 | scroll_state, |
| 64 | current_side: PanelSide::default(), | 66 | current_side: PanelSide::default(), |
| 65 | allowed_sides: PanelAllowedSides::default(), | 67 | allowed_sides: PanelAllowedSides::default(), |
| @@ -99,7 +101,7 @@ impl Panel { · 33 unmodified lines |
| 99 | self | 101 | self |
| 100 | } | 102 | } |
| 101 | | 103 | |
| 102 | fn render<S: 'static + Send + Sync>(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> { | 104 | fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> { |
| 103 | let token = token(); | 105 | let token = token(); |
| 104 | let theme = rose_pine_dawn(); | 106 | let theme = rose_pine_dawn(); |
| 105 | | 107 | |
| @@ -112,7 +114,7 @@ impl Panel { · 6 unmodified lines |
| 112 | .flex_initial() | 114 | .flex_initial() |
| 113 | .h_full() | 115 | .h_full() |
| 114 | // .w(current_width) | 116 | // .w(current_width) |
| 115 | .w_4() | 117 | .w_64() |
| 116 | .fill(theme.middle.base.default.background) | 118 | .fill(theme.middle.base.default.background) |
| 117 | .border_r() | 119 | .border_r() |
| 118 | .border_color(theme.middle.base.default.border); | 120 | .border_color(theme.middle.base.default.border); |
| @@ -122,7 +124,7 @@ impl Panel { · 3 unmodified lines |
| 122 | .flex_initial() | 124 | .flex_initial() |
| 123 | .h_full() | 125 | .h_full() |
| 124 | // .w(current_width) | 126 | // .w(current_width) |
| 125 | .w_4() | 127 | .w_64() |
| 126 | .fill(theme.middle.base.default.background) | 128 | .fill(theme.middle.base.default.background) |
| 127 | .border_l() | 129 | .border_l() |
| 128 | .border_color(theme.middle.base.default.border); | 130 | .border_color(theme.middle.base.default.border); |
| @@ -132,7 +134,7 @@ impl Panel { · 3 unmodified lines |
| 132 | .flex_initial() | 134 | .flex_initial() |
| 133 | .w_full() | 135 | .w_full() |
| 134 | // .h(current_width) | 136 | // .h(current_width) |
| 135 | .h_4() | 137 | .h_64() |
| 136 | .fill(theme.middle.base.default.background) | 138 | .fill(theme.middle.base.default.background) |
| 137 | .border_t() | 139 | .border_t() |
| 138 | .border_color(theme.middle.base.default.border); | 140 | .border_color(theme.middle.base.default.border); |