← Back to branch summary

~mantas/pinta/stable

« back to all changes in this revision

Viewing changes to Pinta.Core/HistoryItems/ResizeHistoryItem.cs

  • Committer: Iain Lane
  • Date: 2010-03-13 18:20:18 UTC
  • mfrom: (1.1.2)
  • Revision ID: git-v1:1781694a68ecf232d0110c0b2f3d4a1b96c74ec2
Merge commit 'upstream/0.2'

Conflicts:
        debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
Pinta.Core/HistoryItems/ResizeHistoryItem.cs
47
47
                
48
48
                public override void Undo ()
49
49
                {
50
 
                        int swap_width = (int)PintaCore.Workspace.ImageSize.X;
51
 
                        int swap_height = (int)PintaCore.Workspace.ImageSize.Y;
 
50
                        int swap_width = PintaCore.Workspace.ImageSize.X;
 
51
                        int swap_height = PintaCore.Workspace.ImageSize.Y;
52
52
 
53
 
                        PintaCore.Workspace.ImageSize = new Cairo.PointD (old_width, old_height);
54
 
                        PintaCore.Workspace.CanvasSize = new Cairo.PointD (old_width, old_height);
 
53
                        PintaCore.Workspace.ImageSize = new Cairo.Point (old_width, old_height);
 
54
                        PintaCore.Workspace.CanvasSize = new Cairo.Point (old_width, old_height);
55
55
                        
56
56
                        old_width = swap_width;
57
57
                        old_height = swap_height;
76
76
 
77
77
                public override void Redo ()
78
78
                {
79
 
                        int swap_width = (int)PintaCore.Workspace.ImageSize.X;
80
 
                        int swap_height = (int)PintaCore.Workspace.ImageSize.Y;
 
79
                        int swap_width = PintaCore.Workspace.ImageSize.X;
 
80
                        int swap_height = PintaCore.Workspace.ImageSize.Y;
81
81
 
82
 
                        PintaCore.Workspace.ImageSize = new Cairo.PointD (old_width, old_height);
83
 
                        PintaCore.Workspace.CanvasSize = new Cairo.PointD (old_width, old_height);
 
82
                        PintaCore.Workspace.ImageSize = new Cairo.Point (old_width, old_height);
 
83
                        PintaCore.Workspace.CanvasSize = new Cairo.Point (old_width, old_height);
84
84
 
85
85
                        old_width = swap_width;
86
86
                        old_height = swap_height;