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

Implement Widget::draw for PaneGrid

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-10-25 15:37:28 +07:00
parent 1afbc98544
commit 41394b4e90
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
6 changed files with 218 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ use crate::container;
use crate::event::{self, Event};
use crate::layout;
use crate::overlay;
use crate::pane_grid::{self, TitleBar};
use crate::pane_grid::TitleBar;
use crate::renderer;
use crate::{Clipboard, Element, Hasher, Layout, Point, Rectangle, Size};
@ -10,22 +10,22 @@ use crate::{Clipboard, Element, Hasher, Layout, Point, Rectangle, Size};
///
/// [`Pane`]: crate::widget::pane_grid::Pane
#[allow(missing_debug_implementations)]
pub struct Content<'a, Message, Renderer: pane_grid::Renderer> {
pub struct Content<'a, Message, Renderer> {
title_bar: Option<TitleBar<'a, Message, Renderer>>,
body: Element<'a, Message, Renderer>,
style: &'a dyn container::StyleSheet,
style_sheet: &'a dyn container::StyleSheet,
}
impl<'a, Message, Renderer> Content<'a, Message, Renderer>
where
Renderer: pane_grid::Renderer,
Renderer: crate::Renderer,
{
/// Creates a new [`Content`] with the provided body.
pub fn new(body: impl Into<Element<'a, Message, Renderer>>) -> Self {
Self {
title_bar: None,
body: body.into(),
style: Default::default(),
style_sheet: Default::default(),
}
}
@ -39,15 +39,15 @@ where
}
/// Sets the style of the [`Content`].
pub fn style(mut self, style: &'a dyn container::StyleSheet) -> Self {
self.style = style;
pub fn style(mut self, style_sheet: &'a dyn container::StyleSheet) -> Self {
self.style_sheet = style_sheet;
self
}
}
impl<'a, Message, Renderer> Content<'a, Message, Renderer>
where
Renderer: pane_grid::Renderer,
Renderer: crate::Renderer,
{
/// Draws the [`Content`] with the provided [`Renderer`] and [`Layout`].
///
@ -60,32 +60,41 @@ where
cursor_position: Point,
viewport: &Rectangle,
) {
// 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();
let bounds = layout.bounds();
// 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,
// )
// }
{
let style = self.style_sheet.style();
container::draw_background(renderer, &style, bounds);
}
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();
let show_controls = bounds.contains(cursor_position);
title_bar.draw(
renderer,
style,
title_bar_layout,
cursor_position,
viewport,
show_controls,
);
self.body.draw(
renderer,
style,
body_layout,
cursor_position,
viewport,
);
} else {
self.body
.draw(renderer, style, layout, cursor_position, viewport);
}
}
/// Returns whether the [`Content`] with the given [`Layout`] can be picked
@ -214,7 +223,7 @@ where
impl<'a, T, Message, Renderer> From<T> for Content<'a, Message, Renderer>
where
T: Into<Element<'a, Message, Renderer>>,
Renderer: pane_grid::Renderer,
Renderer: crate::Renderer,
{
fn from(element: T) -> Self {
Self::new(element)

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

@ -2,7 +2,6 @@ use crate::container;
use crate::event::{self, Event};
use crate::layout;
use crate::overlay;
use crate::pane_grid;
use crate::renderer;
use crate::{
Clipboard, Element, Hasher, Layout, Padding, Point, Rectangle, Size,
@ -12,17 +11,17 @@ use crate::{
///
/// [`Pane`]: crate::widget::pane_grid::Pane
#[allow(missing_debug_implementations)]
pub struct TitleBar<'a, Message, Renderer: pane_grid::Renderer> {
pub struct TitleBar<'a, Message, Renderer> {
content: Element<'a, Message, Renderer>,
controls: Option<Element<'a, Message, Renderer>>,
padding: Padding,
always_show_controls: bool,
style: &'a dyn container::StyleSheet,
style_sheet: &'a dyn container::StyleSheet,
}
impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer>
where
Renderer: pane_grid::Renderer,
Renderer: crate::Renderer,
{
/// Creates a new [`TitleBar`] with the given content.
pub fn new<E>(content: E) -> Self
@ -34,7 +33,7 @@ where
controls: None,
padding: Padding::ZERO,
always_show_controls: false,
style: Default::default(),
style_sheet: Default::default(),
}
}
@ -55,7 +54,7 @@ where
/// Sets the style of the [`TitleBar`].
pub fn style(mut self, style: &'a dyn container::StyleSheet) -> Self {
self.style = style;
self.style_sheet = style;
self
}
@ -75,7 +74,7 @@ where
impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer>
where
Renderer: pane_grid::Renderer,
Renderer: crate::Renderer,
{
/// Draws the [`TitleBar`] with the provided [`Renderer`] and [`Layout`].
///
@ -83,39 +82,47 @@ where
pub fn draw(
&self,
renderer: &mut Renderer,
style: &renderer::Style,
inherited_style: &renderer::Style,
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
show_controls: bool,
) {
// let mut children = layout.children();
// let padded = children.next().unwrap();
let bounds = layout.bounds();
let style = self.style_sheet.style();
let inherited_style = renderer::Style {
text_color: style.text_color.unwrap_or(inherited_style.text_color),
};
// let mut children = padded.children();
// let title_layout = children.next().unwrap();
container::draw_background(renderer, &style, bounds);
// let controls = if let Some(controls) = &self.controls {
// let controls_layout = children.next().unwrap();
let mut children = layout.children();
let padded = children.next().unwrap();
// if show_controls || self.always_show_controls {
// Some((controls, controls_layout))
// } else {
// None
// }
// } else {
// None
// };
let mut children = padded.children();
let title_layout = children.next().unwrap();
// renderer.draw_title_bar(
// defaults,
// layout.bounds(),
// &self.style,
// (&self.content, title_layout),
// controls,
// cursor_position,
// viewport,
// )
self.content.draw(
renderer,
&inherited_style,
title_layout,
cursor_position,
viewport,
);
if let Some(controls) = &self.controls {
let controls_layout = children.next().unwrap();
if show_controls || self.always_show_controls {
controls.draw(
renderer,
&inherited_style,
controls_layout,
cursor_position,
viewport,
);
}
}
}
/// Returns whether the mouse cursor is over the pick area of the