root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Allow corner radiuses of length 1

This commit is contained in:
Martín Capello 2025-09-11 11:13:28 -03:00
parent e082cbb549
commit abf43645da
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/tools/controllers.h
View File

@ -322,7 +322,7 @@ private:
bool hasAngle() const { return (ABS(m_angle) > 0.001); } bool hasAngle() const { return (ABS(m_angle) > 0.001); }
bool hasCornerRadius() const { return (ABS(m_cornerRadius) > 1); } bool hasCornerRadius() const { return (ABS(m_cornerRadius) > 0); }
void onMoveOrigin(const Point& delta) override void onMoveOrigin(const Point& delta) override
{ {

8
src/app/tools/intertwiners.h
View File

@ -196,7 +196,7 @@ public:
const int cornerRadius = loop->getController()->getCornerRadius(); const int cornerRadius = loop->getController()->getCornerRadius();
if (ABS(angle) < 0.001) { if (ABS(angle) < 0.001) {
int r = 0; int r = 0;
if (cornerRadius > 1) { if (cornerRadius > 0) {
int w = x2 - x1; int w = x2 - x1;
int h = y2 - y1; int h = y2 - y1;
int xm = x1 + w / 2; int xm = x1 + w / 2;
@ -214,7 +214,7 @@ public:
} }
} }
else { else {
if (cornerRadius <= 1) { if (cornerRadius <= 0) {
Stroke p = rotateRectangle(x1, y1, x2, y2, angle); Stroke p = rotateRectangle(x1, y1, x2, y2, angle);
int n = p.size(); int n = p.size();
for (int i = 0; i + 1 < n; ++i) { for (int i = 0; i + 1 < n; ++i) {
@ -267,7 +267,7 @@ public:
const int cornerRadius = loop->getController()->getCornerRadius(); const int cornerRadius = loop->getController()->getCornerRadius();
if (ABS(angle) < 0.001) { if (ABS(angle) < 0.001) {
int r = 0; int r = 0;
if (cornerRadius > 1) { if (cornerRadius > 0) {
int w = x2 - x1; int w = x2 - x1;
int h = y2 - y1; int h = y2 - y1;
int xm = x1 + w / 2; int xm = x1 + w / 2;
@ -285,7 +285,7 @@ public:
doPointshapeLineWithoutDynamics(x1, y, x2, y, loop); doPointshapeLineWithoutDynamics(x1, y, x2, y, loop);
} }
else { else {
if (cornerRadius <= 1) { if (cornerRadius <= 0) {
Stroke p = rotateRectangle(x1, y1, x2, y2, angle); Stroke p = rotateRectangle(x1, y1, x2, y2, angle);
auto v = p.toXYInts(); auto v = p.toXYInts();
doc::algorithm::polygon(v.size() / 2, &v[0], loop, (AlgoHLine)doPointshapeHline); doc::algorithm::polygon(v.size() / 2, &v[0], loop, (AlgoHLine)doPointshapeHline);