amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 05:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed shrink(-overflow) for rotated fields

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@871 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-05-19 17:47:02 +00:00
parent fd101f0b94
commit 9f8b35bfed
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/field/text.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ TextStyle::TextStyle(const TextFieldP& field)
double TextStyle::getStretch() const { double TextStyle::getStretch() const {
if (content_width > 0 && ((alignment() & ALIGN_STRETCH) || (alignment() & ALIGN_STRETCH_OVERFLOW))) { if (content_width > 0 && ((alignment() & ALIGN_STRETCH) || (alignment() & ALIGN_STRETCH_OVERFLOW))) {
double factor = (sideways(angle) ? double(height) : width - padding_left - padding_right) / content_width; double factor = (width - padding_left - padding_right) / content_width;
if (alignment() == ALIGN_STRETCH || factor < 1.0) { if (alignment() == ALIGN_STRETCH || factor < 1.0) {
return factor; return factor;
} }
src/util/rotation.cpp
+3 -3
View File
@@ -135,9 +135,9 @@ wxRegion Rotation::trRectToRegion(const RealRect& r) const {
RealPoint Rotation::trInv(const RealPoint& p) const { RealPoint Rotation::trInv(const RealPoint& p) const {
double a = deg_to_rad(angle), s = sin(a), c = cos(a); double a = deg_to_rad(angle), s = sin(a), c = cos(a);
double x = (p.x - origin.x) / zoomX, y = (p.y - origin.y) / zoomY; double x = p.x - origin.x, y = p.y - origin.y;
return RealPoint(c * x - s * y, return RealPoint((c * x - s * y) / zoomX,
s * x + c * y); (s * x + c * y) / zoomY);
} }
RealPoint Rotation::boundingBoxCorner(const RealSize& size) const { RealPoint Rotation::boundingBoxCorner(const RealSize& size) const {