Changeset 13 for os/trunk/System

Timestamp:

Feb 29, 2016, 3:09:13 PM (9 years ago)

Author:

chronos

Message:

• Modified: Allow receive mouse move mesages to focused form even if mouse position is outside of form area.
• Fixed: Pass key press messages only to focused form and focused TControl like TEdit.

File:

• os/trunk/System/LDOS.Kernel.pas (modified) (9 diffs)

os/trunk/System/LDOS.Kernel.pas

@@ -55 +55 @@
   TScreen = class(TComponent)
   private
+    function GetFocusedForm: TForm;
+    procedure SetFocusedForm(const Value: TForm);
   public
     Kernel: TKernel;
@@ -63 +65 @@
     procedure HandleResize;
     procedure Paint;
-    procedure FocusForm(Form: TForm);
+    property FocusedForm: TForm read GetFocusedForm write SetFocusedForm;
     constructor Create; override;
     destructor Destroy; override;
@@ -78 +80 @@
   TMouse = class
     Kernel: TKernel;
+    MovedForm: TForm;
     procedure HandleMove(Position: TPoint);
     procedure HandleDown(Position: TPoint);
@@ -233 +236 @@
 end;
 
-procedure TScreen.FocusForm(Form: TForm);
-var
-  I: Integer;
-  FormIndex: Integer;
-begin
-  FormIndex := Forms.IndexOf(Form);
-  for I := 0 to Forms.Count - 1 do
-    Forms[I].Focused := I = FormIndex;
-
-  Forms.Move(FormIndex, Forms.Count - 1);
-  Paint;
+function TScreen.GetFocusedForm: TForm;
+begin
+  if Forms.Count > 0 then
+   Result := Forms[Forms.Count - 1]
+   else Result := nil;
 end;
 
@@ -272 +269 @@
 end;
 
+procedure TScreen.SetFocusedForm(const Value: TForm);
+var
+  I: Integer;
+  FormIndex: Integer;
+begin
+  FormIndex := Forms.IndexOf(Value);
+  for I := 0 to Forms.Count - 1 do
+    Forms[I].Focused := I = FormIndex;
+
+  Forms.Move(FormIndex, Forms.Count - 1);
+  Paint;
+end;
+
 { TDriver }
 
@@ -313 +323 @@
   try
     for Form in Kernel.Screen.Forms do
+    if Form.Focused then
     if Form.HandleMessage(NewMessage) then begin
       Break;
@@ -356 +367 @@
 begin
   NewMessage := TMessageMouseDown.Create;
+  NewMessage.Position := Position;
+  try
+    for Form in Kernel.Screen.Forms do
+    if Form.Bounds.Contains(Position) then begin
+      MovedForm := Form;
+      if Form.HandleMessage(NewMessage) then begin
+        Break;
+      end;
+    end;
+  finally
+    NewMessage.Destroy;
+  end;
+end;
+
+procedure TMouse.HandleMove(Position: TPoint);
+var
+  Form: TForm;
+  NewMessage: TMessageMouseMove;
+begin
+  NewMessage := TMessageMouseMove.Create;
   NewMessage.Position := Position;
   try
@@ -364 +395 @@
       end;
     end;
-  finally
-    NewMessage.Destroy;
-  end;
-end;
-
-procedure TMouse.HandleMove(Position: TPoint);
-var
-  Form: TForm;
-  NewMessage: TMessageMouseMove;
-begin
-  NewMessage := TMessageMouseMove.Create;
+    if Assigned(Kernel.Screen.FocusedForm) then
+      Kernel.Screen.FocusedForm.HandleMessage(NewMessage);
+  finally
+    NewMessage.Destroy;
+  end;
+end;
+
+procedure TMouse.HandleUp(Position: TPoint);
+var
+  Form: TForm;
+  NewMessage: TMessageMouseUp;
+begin
+  NewMessage := TMessageMouseUp.Create;
   NewMessage.Position := Position;
   try
@@ -383 +416 @@
       end;
     end;
-  finally
-    NewMessage.Destroy;
-  end;
-end;
-
-procedure TMouse.HandleUp(Position: TPoint);
-var
-  Form: TForm;
-  NewMessage: TMessageMouseUp;
-begin
-  NewMessage := TMessageMouseUp.Create;
-  NewMessage.Position := Position;
-  try
-    for Form in Kernel.Screen.Forms do
-    if Form.Bounds.Contains(Position) then begin
-      if Form.HandleMessage(NewMessage) then begin
-        Break;
-      end;
-    end;
+    if Assigned(Kernel.Screen.FocusedForm) then
+      Kernel.Screen.FocusedForm.HandleMessage(NewMessage);
   finally
     NewMessage.Destroy;