Changeset 30 for trunk/Forms

Timestamp:

Dec 23, 2016, 10:07:39 AM (8 years ago)

Author:

chronos

Message:

• Modified: Drawing and loading using bitmap rawimage improvement.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (2 diffs)
• UFormMain.pas (modified) (2 diffs)
• UFormNew.pas (modified) (1 diff)

trunk/Forms/UFormMain.lfm

@@ -16 +16 @@
   object PaintBox1: TPaintBox
     Left = 0
-    Height = 587
-    Top = 0
+    Height = 561
+    Top = 26
     Width = 920
     Align = alClient
@@ -39 +39 @@
       end>
     SimplePanel = False
+  end
+  object ToolBar1: TToolBar
+    Left = 0
+    Height = 26
+    Top = 0
+    Width = 920
+    Caption = 'ToolBar1'
+    TabOrder = 1
+    object ToolButton1: TToolButton
+      Left = 1
+      Top = 2
+      Action = Core.AFileNew
+    end
   end
   object MainMenu1: TMainMenu

trunk/Forms/UFormMain.pas

@@ -40 +40 @@
     StatusBar1: TStatusBar;
     Timer1: TTimer;
+    ToolBar1: TToolBar;
+    ToolButton1: TToolButton;
     procedure FormActivate(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -134 +136 @@
     View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
     //Bitmap.PaintToCanvas(TempBitmap.Canvas, View.SrcRect);
-    //Bitmap.PaintToBitmap(TempBitmap, View.SrcRect);
+    Bitmap.PaintToBitmap(TempBitmap, View.SrcRect);
     //TempBitmap.EndUpdate(False);
     PaintBox1.Canvas.StretchDraw(View.DestRect, TempBitmap);

trunk/Forms/UFormNew.pas

@@ -74 +74 @@
 
   // Default
-  SpinEditWidth.Value := 200;
-  SpinEditHeight.Value := 100;
+  if Assigned(Core.Project) then begin
+    SpinEditWidth.Value := Core.Project.Bitmap.Size.X;
+    SpinEditHeight.Value := Core.Project.Bitmap.Size.Y;
+  end else begin
+    SpinEditWidth.Value := 200;
+    SpinEditHeight.Value := 100;
+  end;
   SpinEditDPI.Value := 72;
 end;