me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove trait-specific draw logic in iced_native

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-10-14 16:07:22 +07:00
parent 3aae45c191
commit 03b3493138
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
71 changed files with 641 additions and 3126 deletions
Download patch file Download diff file Expand all files Collapse all files

51
native/src/widget/pane_grid/content.rs
View file

@ -61,32 +61,33 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
) -> Renderer::Output {
if let Some(title_bar) = &self.title_bar {
let mut children = layout.children();
let title_bar_layout = children.next().unwrap();
let body_layout = children.next().unwrap();
) {
// TODO
// if let Some(title_bar) = &self.title_bar {
// let mut children = layout.children();
// let title_bar_layout = children.next().unwrap();
// let body_layout = children.next().unwrap();
renderer.draw_pane(
defaults,
layout.bounds(),
&self.style,
Some((title_bar, title_bar_layout)),
(&self.body, body_layout),
cursor_position,
viewport,
)
} else {
renderer.draw_pane(
defaults,
layout.bounds(),
&self.style,
None,
(&self.body, layout),
cursor_position,
viewport,
)
}
// renderer.draw_pane(
// defaults,
// layout.bounds(),
// &self.style,
// Some((title_bar, title_bar_layout)),
// (&self.body, body_layout),
// cursor_position,
// viewport,
// )
// } else {
// renderer.draw_pane(
// defaults,
// layout.bounds(),
// &self.style,
// None,
// (&self.body, layout),
// cursor_position,
// viewport,
// )
// }
}
/// Returns whether the [`Content`] with the given [`Layout`] can be picked

48
native/src/widget/pane_grid/title_bar.rs
View file

@ -90,34 +90,34 @@ where
cursor_position: Point,
viewport: &Rectangle,
show_controls: bool,
) -> Renderer::Output {
let mut children = layout.children();
let padded = children.next().unwrap();
) {
// let mut children = layout.children();
// let padded = children.next().unwrap();
let mut children = padded.children();
let title_layout = children.next().unwrap();
// let mut children = padded.children();
// let title_layout = children.next().unwrap();
let controls = if let Some(controls) = &self.controls {
let controls_layout = children.next().unwrap();
// let controls = if let Some(controls) = &self.controls {
// let controls_layout = children.next().unwrap();
if show_controls || self.always_show_controls {
Some((controls, controls_layout))
} else {
None
}
} else {
None
};
// if show_controls || self.always_show_controls {
// Some((controls, controls_layout))
// } else {
// None
// }
// } else {
// None
// };
renderer.draw_title_bar(
defaults,
layout.bounds(),
&self.style,
(&self.content, title_layout),
controls,
cursor_position,
viewport,
)
// renderer.draw_title_bar(
// defaults,
// layout.bounds(),
// &self.style,
// (&self.content, title_layout),
// controls,
// cursor_position,
// viewport,
// )
}
/// Returns whether the mouse cursor is over the pick area of the