Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-12 08:24:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

When fixed_dimension_panel uses the display width/height ensure it only uses the available remaining width/height based on where it's positioned

Browse source
This commit is contained in:
Michael Davidson 2024-01-20 16:42:54 +11:00
parent 1918064722
commit 29d4984b33
No known key found for this signature in database
GPG key ID: B8D1A99712B8B0EB
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
esphome/components/graphical_layout/fixed_dimension_panel.cpp
View file

@ -32,12 +32,15 @@ display::Rect FixedDimensionPanel::measure_item_internal(display::Display *displ
// Call measure_child so they can do any measurements // Call measure_child so they can do any measurements
display::Rect child_size = this->child_->measure_item(display); display::Rect child_size = this->child_->measure_item(display);
display::Rect rect(0, 0, this->width_.value(), this->height_.value()); display::Rect rect(0, 0, this->width_.value(), this->height_.value());
display::Point origin_in_global = display->get_local_coordinates();
if (rect.w < 0) { if (rect.w < 0) {
if (this->unset_width_uses_display_width_) { if (this->unset_width_uses_display_width_) {
rect.w = display->get_width(); rect.w = display->get_width();
// We need to account for our own padding + margin + border // We need to account for our own padding + margin + border
rect.w -= this->margin_.horizontal() + this->border_.horizontal() + this->padding_.horizontal(); rect.w -= this->margin_.horizontal() + this->border_.horizontal() + this->padding_.horizontal();
// Account for where we sit within the display
rect.w -= origin_in_global.x;
} else { } else {
rect.w = child_size.w; rect.w = child_size.w;
} }
@ -48,6 +51,8 @@ display::Rect FixedDimensionPanel::measure_item_internal(display::Display *displ
rect.h = display->get_height(); rect.h = display->get_height();
// We need to account for our own padding + margin + border // We need to account for our own padding + margin + border
rect.h -= this->margin_.vertical() + this->border_.vertical() + this->padding_.vertical(); rect.h -= this->margin_.vertical() + this->border_.vertical() + this->padding_.vertical();
// Account for where we sit within the display
rect.h -= origin_in_global.y;
} else { } else {
rect.h = child_size.h; rect.h = child_size.h;
} }