Changeset 35 for trunk/Forms

Timestamp:

May 4, 2018, 12:56:52 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Do not allocate big temp image for drawing on screen of zoomed out image.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (3 diffs)
• UFormMain.pas (modified) (3 diffs)

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 664
+  Left = 648
   Height = 640
-  Top = 382
+  Top = 323
   Width = 920
   Caption = 'LibrePaint'
-  ClientHeight = 608
+  ClientHeight = 615
   ClientWidth = 920
+  DesignTimePPI = 120
   Menu = MainMenu1
   OnActivate = FormActivate
@@ -13 +14 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.8.2.0'
   object PaintBox1: TPaintBox
     Left = 0
-    Height = 554
+    Height = 561
     Top = 26
     Width = 920
@@ -32 +33 @@
     Left = 0
     Height = 28
-    Top = 580
+    Top = 587
     Width = 920
     Panels = <    
       item
-        Width = 200
+        Width = 300
       end    
       item

trunk/Forms/UFormMain.pas

@@ -135 +135 @@
     StatusBar1.Panels[0].Text := '[' + IntToStr(Pos.X) + ', ' + IntToStr(Pos.Y) + '] Zoom:' +
       FloatToStr(Core.Project.View.Zoom);
-    StatusBar1.Panels[1].Text := 'Src: ' + IntToStr(View.SrcRect.Right - View.SrcRect.Left) + ', ' +
+    StatusBar1.Panels[1].Text := 'Src: ' + IntToStr(View.SrcRect.Left) + ', ' +
+      IntToStr(View.SrcRect.Top) + ', ' +
+      IntToStr(View.SrcRect.Right - View.SrcRect.Left) + ', ' +
       IntToStr(View.SrcRect.Bottom - View.SrcRect.Top);
-    StatusBar1.Panels[2].Text := 'Dst: ' + IntToStr(View.DestRect.Right - View.DestRect.Left) + ', ' +
+    StatusBar1.Panels[2].Text := 'Dst: ' + IntToStr(View.DestRect.Left) + ', ' +
+      IntToStr(View.DestRect.Top) + ', ' +
+      IntToStr(View.DestRect.Right - View.DestRect.Left) + ', ' +
       IntToStr(View.DestRect.Bottom - View.DestRect.Top);
   end;
@@ -150 +154 @@
 begin
   with Core.Project do begin
-    TempBitmap.SetSize(View.SrcRect.Right - View.SrcRect.Left,
-      View.SrcRect.Bottom - View.SrcRect.Top);
+    //TempBitmap.SetSize(View.SrcRect.Right - View.SrcRect.Left,
+    //  View.SrcRect.Bottom - View.SrcRect.Top);
+    TempBitmap.SetSize(PaintBox1.Width, PaintBox1.Height);
     //TempBitmap.BeginUpdate(True);
     TempBitmap.Canvas.Brush.Color := clBlack;
@@ -158 +163 @@
    // Bitmap.PaintToCanvas(TempBitmap.Canvas, View.SrcRect);
    // if EnableDraw then
-      Bitmap.PaintToBitmap(TempBitmap, View.SrcRect);
+    Bitmap.PaintToBitmap(TempBitmap, View.SrcRect);
+      //StatusBar1.Panels[0].Text := IntToStr(TempBitmap.Width) + ', ' + IntToStr(TempBitmap.Height);
     //TempBitmap.EndUpdate(False);
-    PaintBox1.Canvas.StretchDraw(View.DestRect, TempBitmap);
+    PaintBox1.Canvas.Draw(0, 0, TempBitmap);
     //PaintBox1.Canvas.Draw(0, 0, TempBitmap);
   end;