Changeset 13 for os/trunk/Xvcl

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.

Location:

os/trunk/Xvcl

Files:

• Xvcl.Controls.pas (modified) (6 diffs)
• Xvcl.Forms.pas (modified) (2 diffs)

os/trunk/Xvcl/Xvcl.Controls.pas

@@ -60 +60 @@
     FOnMouseUp: TNotifyEvent;
     FOnKeyPress: TNotifyEvent;
+    FFocused: Boolean;
     function GetCanvas: TCanvas;
     procedure SetParent(const Value: TWinControl); virtual;
     procedure SetColor(const Value: TColor);
+    procedure SetFocused(const Value: Boolean);
   protected
     function GetVideoDevice: TVideoDevice; virtual;
@@ -79 +81 @@
     property VideoDevice: TVideoDevice read GetVideoDevice;
     property Color: TColor read FColor write SetColor;
+    property Focused: Boolean read FFocused write SetFocused;
     property OnClick: TNotifyEvent read FOnClick write FOnClick;
     property OnMouseDown: TNotifyEvent read FOnMouseDown write FOnMouseDown;
@@ -88 +91 @@
   protected
     function HandleMessage(Message: TMessage): Boolean; override;
+  private
+   procedure ClearFocus;
   public
     Controls: TList<TControl>;
@@ -193 +198 @@
     if Visible then Paint;
   end;
+end;
+
+procedure TControl.SetFocused(const Value: Boolean);
+begin
+  if Value then FParent.ClearFocus;
+  FFocused := Value;
 end;
 
@@ -268 +279 @@
 
 { TWinControl }
+
+procedure TWinControl.ClearFocus;
+var
+ Control: TControl;
+begin
+  for Control in Controls do
+    Control.Focused := False;
+end;
 
 constructor TWinControl.Create;
@@ -342 +361 @@
 begin
   Result := False;
-  if Message is TMessageKeyPress then
+  if (Message is TMessageMouseDown) then
+   Focused := True
+  else
+  if (Message is TMessageKeyPress) and Focused then
   with TMessageKeyPress(Message) do begin
     if Assigned(FOnKeyPress) then FOnKeyPress(Self);

os/trunk/Xvcl/Xvcl.Forms.pas

@@ -90 +90 @@
       Move.StartMousePos := Position;
       Move.Active := True;
-     Result := True;
+      Result := True;
     end;
   end else
@@ -137 +137 @@
   if FFocused <> Value then begin
     FFocused := Value;
-    if Value then TScreen(Screen).FocusForm(Self);
+    if Value then TScreen(Screen).FocusedForm := Self;
   end;
 end;