-
Notifications
You must be signed in to change notification settings - Fork 567
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Aspect ratio box #1645
Merged
Merged
Aspect ratio box #1645
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
03d367a
adding first draft of aspect ratio box
arthmis 06174bf
Merge branch 'master' of https://github.com/linebender/druid into asp…
arthmis 63605ae
fixing issue in example with env tracing
arthmis 7174d14
adding instrument macro to widget impl
arthmis b49be71
Merge branch 'master' of https://github.com/linebender/druid into asp…
arthmis 2322c0b
updating generate aspect ratio logic
arthmis 4c3fd14
updating layout tests for aspect ratio
arthmis d00b060
Merge branch 'master' of https://github.com/linebender/druid into asp…
arthmis 0f2e9ef
updating changelog with aspect ratio box info
arthmis 8743d57
Merge branch 'master' of https://github.com/linebender/druid into asp…
arthmis f262229
pushing changes to layout with addition of aspect_ratio,
arthmis e7ea835
Merge branch 'master' of https://github.com/linebender/druid into asp…
arthmis a513db6
fixing message in layout example
arthmis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
use druid::{ | ||
widget::{AspectRatioBox, Flex, Label, LineBreaking, MainAxisAlignment, SizedBox}, | ||
AppLauncher, Color, Data, Env, Lens, Widget, WidgetExt, WindowDesc, | ||
}; | ||
|
||
fn main() { | ||
let window = WindowDesc::new(ui()); | ||
let fixed_message = | ||
"Hello there, this is a fixed size box and it will not change no matter what."; | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
let aspect_ratio_message = | ||
"Hello there, this is a box that maintains it's aspect-ratio as best as possible. Notice text will overflow if box becomes too small."; | ||
AppLauncher::with_window(window) | ||
.launch(AppState { | ||
fixed_box: fixed_message.to_string(), | ||
aspect_ratio_box: aspect_ratio_message.to_string(), | ||
}) | ||
.unwrap(); | ||
} | ||
#[derive(Clone, Data, Lens, Debug)] | ||
struct AppState { | ||
fixed_box: String, | ||
aspect_ratio_box: String, | ||
} | ||
|
||
fn ui() -> impl Widget<AppState> { | ||
let fixed_label = Label::new(|data: &String, _env: &Env| data.clone()) | ||
.with_text_color(Color::BLACK) | ||
.with_line_break_mode(LineBreaking::WordWrap) | ||
.center() | ||
.lens(AppState::fixed_box); | ||
let fixed_box = SizedBox::new(fixed_label) | ||
.height(250.) | ||
.width(250.) | ||
.background(Color::WHITE); | ||
|
||
let aspect_ratio_label = Label::new(|data: &String, _env: &Env| data.clone()) | ||
.with_text_color(Color::BLACK) | ||
.with_line_break_mode(LineBreaking::WordWrap) | ||
.center() | ||
.lens(AppState::aspect_ratio_box); | ||
let aspect_ratio_box = AspectRatioBox::new(aspect_ratio_label, 2.0) | ||
.border(Color::BLACK, 1.0) | ||
.background(Color::WHITE); | ||
|
||
Flex::column() | ||
.with_flex_child(fixed_box, 1.0) | ||
// using flex child so that aspect_ratio doesn't get any infinite constraints | ||
// you can use this in `with_child` but there might be some unintended behavior | ||
// the aspect ratio box will work correctly but it might use up all the | ||
// allotted space and make any flex children disappear | ||
.with_flex_child(aspect_ratio_box, 1.0) | ||
.main_axis_alignment(MainAxisAlignment::SpaceEvenly) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,279 @@ | ||
use druid::widget::prelude::*; | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
use druid::Data; | ||
use tracing::{instrument, warn}; | ||
|
||
/// A widget that preserves the aspect ratio given to it. | ||
/// | ||
/// If given a child, this widget forces the child to have a width and height that preserves | ||
/// the aspect ratio. | ||
/// | ||
/// If not given a child, The box will try to size itself as large or small as possible | ||
/// to preserve the aspect ratio. | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
pub struct AspectRatioBox<T> { | ||
inner: Option<Box<dyn Widget<T>>>, | ||
ratio: f64, | ||
} | ||
|
||
impl<T> AspectRatioBox<T> { | ||
/// Create container with a child and aspect ratio. | ||
/// | ||
/// If aspect ratio <= 0.0, the ratio will be set to 1.0 | ||
pub fn new(inner: impl Widget<T> + 'static, ratio: f64) -> Self { | ||
Self { | ||
inner: Some(Box::new(inner)), | ||
ratio: AspectRatioBox::<T>::clamp_ratio(ratio), | ||
} | ||
} | ||
|
||
/// Create container without child but with an aspect ratio. | ||
/// | ||
/// If aspect ratio <= 0.0, the ratio will be set to 1.0 | ||
pub fn empty(ratio: f64) -> Self { | ||
Self { | ||
inner: None, | ||
ratio: AspectRatioBox::<T>::clamp_ratio(ratio), | ||
} | ||
} | ||
|
||
/// Set the ratio of the box. | ||
/// | ||
/// The ratio has to be a value between 0 and 1, excluding 0. It will be clamped | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/// to those values if they exceed the bounds. If the ratio is 0, then the ratio | ||
/// will become 1. | ||
pub fn set_ratio(&mut self, ratio: f64) { | ||
self.ratio = AspectRatioBox::<T>::clamp_ratio(ratio); | ||
} | ||
|
||
// clamps the ratio between 0.0 and f64::MAX | ||
// if ratio is 0.0 then it will return 1.0 to avoid creating NaN | ||
fn clamp_ratio(mut ratio: f64) -> f64 { | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
ratio = f64::clamp(ratio, 0.0, f64::MAX); | ||
if ratio == 0.0 { | ||
// should I force the ratio to be 1 in this case? | ||
1.0 | ||
} else { | ||
ratio | ||
} | ||
} | ||
} | ||
|
||
impl<T: Data> Widget<T> for AspectRatioBox<T> { | ||
#[instrument( | ||
name = "AspectRatioBox", | ||
level = "trace", | ||
skip(self, ctx, event, data, env) | ||
)] | ||
fn event(&mut self, ctx: &mut EventCtx, event: &Event, data: &mut T, env: &Env) { | ||
if let Some(ref mut inner) = self.inner { | ||
inner.event(ctx, event, data, env); | ||
} | ||
} | ||
|
||
#[instrument( | ||
name = "AspectRatioBox", | ||
level = "trace", | ||
skip(self, ctx, event, data, env) | ||
)] | ||
fn lifecycle(&mut self, ctx: &mut LifeCycleCtx, event: &LifeCycle, data: &T, env: &Env) { | ||
if let Some(ref mut inner) = self.inner { | ||
inner.lifecycle(ctx, event, data, env) | ||
} | ||
} | ||
|
||
#[instrument( | ||
name = "AspectRatioBox", | ||
level = "trace", | ||
skip(self, ctx, old_data, data, env) | ||
)] | ||
fn update(&mut self, ctx: &mut UpdateCtx, old_data: &T, data: &T, env: &Env) { | ||
if let Some(ref mut inner) = self.inner { | ||
inner.update(ctx, old_data, data, env); | ||
} | ||
} | ||
|
||
#[instrument( | ||
name = "AspectRatioBox", | ||
level = "trace", | ||
skip(self, ctx, bc, data, env) | ||
)] | ||
fn layout(&mut self, ctx: &mut LayoutCtx, bc: &BoxConstraints, data: &T, env: &Env) -> Size { | ||
bc.debug_check("AspectRatioBox"); | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
let bc = if bc.max() == bc.min() { | ||
warn!("Box constraints are tight. Aspect ratio box will not be able to preserve aspect ratio."); | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
*bc | ||
} else if bc.max().width == f64::INFINITY && bc.max().height == f64::INFINITY { | ||
warn!("Box constraints are INFINITE. Aspect ratio box won't be able to choose a size because the constraints given by the parent widget are INFINITE."); | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// should I do this or should I just choose a default size | ||
// I size the box with the child's size if there is one | ||
let size = match self.inner.as_mut() { | ||
Some(inner) => inner.layout(ctx, &bc, data, env), | ||
None => Size::new(500., 500.), | ||
}; | ||
|
||
BoxConstraints::new(Size::new(0., 0.), size) | ||
} else { | ||
let (mut box_width, mut box_height) = (bc.max().width, bc.max().height); | ||
|
||
if self.ratio < 1.0 { | ||
if (box_height >= box_width && box_height * self.ratio <= box_width) | ||
|| box_width > box_height | ||
{ | ||
box_width = box_height * self.ratio; | ||
} else if box_height >= box_width && box_height * self.ratio > box_width { | ||
box_height = box_width / self.ratio; | ||
} else { | ||
// I'm not sure if these sections are necessary or correct | ||
// dbg!("ratio can't be preserved {}", self.ratio); | ||
warn!("The aspect ratio cannot be preserved because one of dimensions is tight and the other dimension is too small: bc.max() = {}, bc.min() = {}", bc.max(), bc.min()); | ||
} | ||
|
||
BoxConstraints::tight(Size::new(box_width, box_height)) | ||
} else if self.ratio > 1.0 { | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if box_width > box_height && box_height * self.ratio <= box_width { | ||
box_width = box_height * self.ratio; | ||
} | ||
// this condition might be wrong if box_width and height are equal to each other | ||
// and the aspect ratio is something like 1.00000000000000001, in this case | ||
// the box_height * self.ratio could be equal to box_width | ||
// however 1.00000000000000001 does equal 1.0 | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
else if (box_width >= box_height && box_height * self.ratio > box_width) | ||
|| box_height > box_width | ||
{ | ||
box_height = box_width / self.ratio; | ||
} else { | ||
// I'm not sure if these sections are necessary or correct | ||
// dbg!("ratio can't be preserved {}", self.ratio); | ||
warn!("The aspect ratio cannot be preserved because one of dimensions is tight and the other dimension is too small: bc.max() = {}, bc.min() = {}", bc.max(), bc.min()); | ||
} | ||
|
||
BoxConstraints::tight(Size::new(box_width, box_height)) | ||
} | ||
// the aspect ratio is 1:1 which means we want a square | ||
// we take the minimum between the width and height and constrain to that min | ||
else { | ||
let min = box_width.min(box_height); | ||
BoxConstraints::tight(Size::new(min, min)) | ||
} | ||
}; | ||
|
||
let size = match self.inner.as_mut() { | ||
Some(inner) => inner.layout(ctx, &bc, data, env), | ||
None => bc.max(), | ||
}; | ||
|
||
size | ||
} | ||
|
||
#[instrument(name = "AspectRatioBox", level = "trace", skip(self, ctx, data, env))] | ||
fn paint(&mut self, ctx: &mut PaintCtx, data: &T, env: &Env) { | ||
if let Some(ref mut inner) = self.inner { | ||
inner.paint(ctx, data, env); | ||
} | ||
} | ||
|
||
fn id(&self) -> Option<WidgetId> { | ||
self.inner.as_ref().and_then(|inner| inner.id()) | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::*; | ||
use crate::tests::harness::*; | ||
use crate::widget::Label; | ||
arthmis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
use crate::WidgetExt; | ||
|
||
#[test] | ||
fn tight_constraints() { | ||
let id = WidgetId::next(); | ||
let (width, height) = (400., 400.); | ||
let aspect = AspectRatioBox::<()>::new(Label::new("hello!"), 1.0) | ||
.with_id(id) | ||
.fix_width(width) | ||
.fix_height(height) | ||
.center(); | ||
|
||
let (window_width, window_height) = (600., 600.); | ||
|
||
Harness::create_simple((), aspect, |harness| { | ||
harness.set_initial_size(Size::new(window_width, window_height)); | ||
harness.send_initial_events(); | ||
harness.just_layout(); | ||
let state = harness.get_state(id); | ||
assert_eq!(state.layout_rect().size(), Size::new(width, height)); | ||
}); | ||
} | ||
|
||
#[test] | ||
fn infinite_constraints_with_child() { | ||
let id = WidgetId::next(); | ||
let (width, height) = (100., 100.); | ||
let label = Label::new("hello!").fix_width(width).height(height); | ||
let aspect = AspectRatioBox::<()>::new(label, 1.0) | ||
.with_id(id) | ||
.scroll() | ||
.center(); | ||
|
||
let (window_width, window_height) = (600., 600.); | ||
|
||
Harness::create_simple((), aspect, |harness| { | ||
harness.set_initial_size(Size::new(window_width, window_height)); | ||
harness.send_initial_events(); | ||
harness.just_layout(); | ||
let state = harness.get_state(id); | ||
assert_eq!(state.layout_rect().size(), Size::new(width, height)); | ||
}); | ||
} | ||
#[test] | ||
fn infinite_constraints_without_child() { | ||
let id = WidgetId::next(); | ||
let aspect = AspectRatioBox::<()>::empty(1.0) | ||
.with_id(id) | ||
.scroll() | ||
.center(); | ||
|
||
let (window_width, window_height) = (600., 600.); | ||
|
||
Harness::create_simple((), aspect, |harness| { | ||
harness.set_initial_size(Size::new(window_width, window_height)); | ||
harness.send_initial_events(); | ||
harness.just_layout(); | ||
let state = harness.get_state(id); | ||
assert_eq!(state.layout_rect().size(), Size::new(500., 500.)); | ||
}); | ||
} | ||
|
||
// this test still needs some work | ||
// I am testing for this condition: | ||
// The box constraint on the width's min and max is 300.0. | ||
// The height of the window is 50.0 and width 600.0. | ||
// I'm not sure what size the SizedBox passes in for the height constraint | ||
// but it is most likely 50.0 for max and 0.0 for min. | ||
// The aspect ratio is 2.0 which means the box has to have dimensions (300., 150.) | ||
// however given these constraints it isn't possible. | ||
// should the aspect ratio box maintain aspect ratio anyways or should it clip/overflow? | ||
#[test] | ||
fn tight_constraint_on_width() { | ||
let id = WidgetId::next(); | ||
let label = Label::new("hello!"); | ||
let aspect = AspectRatioBox::<()>::new(label, 2.0) | ||
.with_id(id) | ||
.fix_width(300.) | ||
// wrap in align widget because root widget must fill the window space | ||
.center(); | ||
|
||
let (window_width, window_height) = (600., 50.); | ||
|
||
Harness::create_simple((), aspect, |harness| { | ||
harness.set_initial_size(Size::new(window_width, window_height)); | ||
harness.send_initial_events(); | ||
harness.just_layout(); | ||
let state = harness.get_state(id); | ||
dbg!(state.layout_rect().size()); | ||
// assert_eq!(state.layout_rect().size(), Size::new(500., 500.)); | ||
}); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think instead of a new example I might try to add this to
examples/layout.rs
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see how layout example is related? I feel like there should be an example that shows off the different types of box widgets, like it would have
SizedBox
,AspectRatio
,ConstrainedBox
, and any future box like widgets likeUnconstrainedBox
and so on. I feel like the layout example would let AspectRatio disappear in the noise of the other widgets. I do plan to add the other box widgets soon, like theFractionallySizedBox
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After looking at both examples, I'm not sure this fits well in
--example layout
without reworking that example. I think it does make sense to have a comprehensive layout example, but I'm worried that the current example will become convoluted without a thoughtful rework, which I think is outside the scope of this PR.