Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
magicseteditor
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
magicseteditor
Commits
6069b9e7
Commit
6069b9e7
authored
Sep 21, 2007
by
twanvl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simpler implementation of stretch-overflow with rotation and alignment.
parent
8ff4df04
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
8 deletions
+3
-8
src/data/field/text.hpp
src/data/field/text.hpp
+1
-6
src/util/rotation.cpp
src/util/rotation.cpp
+2
-2
No files found.
src/data/field/text.hpp
View file @
6069b9e7
...
...
@@ -82,12 +82,7 @@ class TextStyle : public Style {
/// The rotation to use when drawing
inline
Rotation
getRotation
()
const
{
double
stretch
=
getStretch
();
if
(
sideways
(
angle
))
{
return
Rotation
(
angle
,
getRect
(),
stretch
,
1
/
stretch
);
}
else
{
return
Rotation
(
angle
,
getRect
(),
1.0
,
stretch
);
}
return
Rotation
(
angle
,
getRect
(),
1.0
,
getStretch
());
}
/// The rotation to use when determining content layout, does not include the stretch factor
inline
Rotation
getRotationNoStretch
()
const
{
...
...
src/util/rotation.cpp
View file @
6069b9e7
...
...
@@ -22,8 +22,8 @@ Rotation::Rotation(int angle, const RealRect& rect, double zoom, double strectch
:
angle
(
constrain_angle
(
angle
))
,
size
(
rect
.
size
())
,
origin
(
rect
.
position
())
,
zoomX
(
zoom
*
strectch
)
,
zoomY
(
zoom
)
,
zoomX
(
::
sideways
(
angle
)
?
zoom
:
zoom
*
strectch
)
,
zoomY
(
!::
sideways
(
angle
)
?
zoom
:
zoom
*
strectch
)
{
if
(
is_internal
)
{
size
=
trNoNeg
(
size
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment