sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

[display] Fix Rect::inside (#8679)

Browse Source
This commit is contained in:
Clyde Stubbs
2025-05-05 10:04:33 +10:00
committed by GitHub
parent 4dc6cbe2d7
commit 3ed03edfec
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
esphome/components/display/rect.cpp
View File

@@ -69,21 +69,16 @@ bool Rect::inside(int16_t test_x, int16_t test_y, bool absolute) const { // NOL
return true; return true;
} }
if (absolute) { if (absolute) {
return ((test_x >= this->x) && (test_x <= this->x2()) && (test_y >= this->y) && (test_y <= this->y2())); return test_x >= this->x && test_x < this->x2() && test_y >= this->y && test_y < this->y2();
} else {
return ((test_x >= 0) && (test_x <= this->w) && (test_y >= 0) && (test_y <= this->h));
} }
return test_x >= 0 && test_x < this->w && test_y >= 0 && test_y < this->h;
} }
bool Rect::inside(Rect rect, bool absolute) const { bool Rect::inside(Rect rect) const {
if (!this->is_set() || !rect.is_set()) { if (!this->is_set() || !rect.is_set()) {
return true; return true;
} }
if (absolute) { return this->x2() >= rect.x && this->x <= rect.x2() && this->y2() >= rect.y && this->y <= rect.y2();
return ((rect.x <= this->x2()) && (rect.x2() >= this->x) && (rect.y <= this->y2()) && (rect.y2() >= this->y));
} else {
return ((rect.x <= this->w) && (rect.w >= 0) && (rect.y <= this->h) && (rect.h >= 0));
}
} }
void Rect::info(const std::string &prefix) { void Rect::info(const std::string &prefix) {

2
esphome/components/display/rect.h
View File

@@ -26,7 +26,7 @@ class Rect {
void extend(Rect rect); void extend(Rect rect);
void shrink(Rect rect); void shrink(Rect rect);
bool inside(Rect rect, bool absolute = true) const; bool inside(Rect rect) const;
bool inside(int16_t test_x, int16_t test_y, bool absolute = true) const; bool inside(int16_t test_x, int16_t test_y, bool absolute = true) const;
bool equal(Rect rect) const; bool equal(Rect rect) const;
void info(const std::string &prefix = "rect info:"); void info(const std::string &prefix = "rect info:");