|
@@ -42,22 +42,22 @@ Size2 TextureButton::get_minimum_size() const {
|
|
else
|
|
else
|
|
rscale= hover->get_size();
|
|
rscale= hover->get_size();
|
|
} else
|
|
} else
|
|
- rscale= pressed->get_size()*scale;
|
|
|
|
|
|
+ rscale=pressed->get_size();
|
|
|
|
|
|
} else
|
|
} else
|
|
rscale= normal->get_size();
|
|
rscale= normal->get_size();
|
|
|
|
|
|
- return rscale*scale;
|
|
|
|
|
|
+ return rscale*scale.abs();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
bool TextureButton::has_point(const Point2& p_point) const {
|
|
bool TextureButton::has_point(const Point2& p_point) const {
|
|
|
|
|
|
- if (scale[0] <= 0 || scale[1] <= 0) {
|
|
|
|
|
|
+ if (scale[0] == 0 || scale[1] == 0) {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
- Point2 ppos = p_point/scale;
|
|
|
|
|
|
+ Point2 ppos = p_point/scale.abs();
|
|
|
|
|
|
if (click_mask.is_valid()) {
|
|
if (click_mask.is_valid()) {
|
|
|
|
|