gui design - Combining rotation and straightening of images

Topic may seem weird as the two terms seem to mean the same.

Clarification:

• Rotation: The typical way of grabbing a corner and pulling in the direction you want the image to rotate.



• Straightening: Drawing a straight line between two points where the horizon should be. Poor example at pixenate.

---

Questions:

• Ideas for how to combine the two into one and the same tool? A solution would be to use Rotation when cursor is close to the corners (Straighten otherwise. My worry is that users could be used to grabbing any part of the image for rotation. Especially as this would be a single dedicated tool. (Not combined with e.g. crop, or free transform)
  
  
  
  • Change the shape of the cursor in a very obvious way perhaps?
    
    
    
    • Thoughts on cursorshape for Straighten?