From 7406cfb29918bd45bfb193a3255df1af60a4c49f Mon Sep 17 00:00:00 2001
From: JianjunLiu <cqljj123@126.com>
Date: Wed, 8 Nov 2023 11:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化windows下多屏幕大小的计算
---
 funcext/tvclib/tslvcl.tsf            | 12 +++++++-----
 funcext/tvclib/utslvclbase.tsf       | 14 +++++++++++++-
 funcext/tvclib/utslvclmemstruct.tsf  |  5 ++---
 funcext/tvclib/utslvclstdctl.tsf     | 26 +++++++++++++-------------
 funcext/tvclib/uwindowsinterface.tsf |  6 ++++--
 5 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/funcext/tvclib/tslvcl.tsf b/funcext/tvclib/tslvcl.tsf
index 3c33fc3..0a28b59 100644
--- a/funcext/tvclib/tslvcl.tsf
+++ b/funcext/tvclib/tslvcl.tsf
@@ -3953,7 +3953,7 @@ type tdatetimepicker = class(tthreeEntry)
         FCalender.WsPopUp := true;
         FCalender.parent := self;
         FCalender.Visible := false;
-        FScreenRect := _wapi.GetScreenRect();
+        //FScreenRect := _wapi.GetScreenRect();
         decodedate(date(),y,m,d);
         setDate(y,m,d);
         FCalender.onSelect := function(o,e)begin
@@ -4067,10 +4067,12 @@ type tdatetimepicker = class(tthreeEntry)
         if FCalender.Visible = nv then return FCalender.show(0);
         rc := ClientRect;
         nrc := ClientToScreen(rc[0],rc[3]); 
-        if FScreenRect[3]-nrc[1]<200 then 
+        p2 := clienttoscreen(rc[0],rc[1]+FCalender.height);
+        src := _wapi.GetScreenRect(nrc);
+        if (src[3]<p2[1]) then //��������������ʱ����
         begin 
-            nrc[1]:= nrc[0]-height-FCalender.height-2;    
-        end 
+            nrc := ClientToScreen(rc[0],rc[1]-FCalender.height); 
+        end
         FCalender.Left := nrc[0];
         FCalender.top := nrc[1]; 
         dt := getDate();
@@ -4114,7 +4116,7 @@ type tdatetimepicker = class(tthreeEntry)
         ti := strtointdef(t,1);
         return ti;    
     end 
-    FScreenRect;
+    //FScreenRect;
     FCalender;
     [weakref]Fonselectchange;
 end 
diff --git a/funcext/tvclib/utslvclbase.tsf b/funcext/tvclib/utslvclbase.tsf
index 52cecad..5038089 100644
--- a/funcext/tvclib/utslvclbase.tsf
+++ b/funcext/tvclib/utslvclbase.tsf
@@ -21,12 +21,24 @@ uses uwindowsinterface;
 					 4. �����external������win32api������msdn�в��Ҿ����÷�
 	**}
 		 public  
-		  function GetScreenRect();
+		  function GetScreenRect(p);
     begin
     {**
         @explan(˵��) ��ȡ��Ļ��С%%
         @return(array) ��������  %%
     **}
+{$ifdef linux}
+{$else}
+    if ifarray(p) then getmonitorrect := true;
+{$endif }
+        if getmonitorrect then 
+        begin
+            r1 := array(p[0]-2,p[0]+2,p[1]-2,p[1]+2);
+            mh := MonitorFromRect(r1,2);
+            info := new TMONITORINFO();
+            GetMonitorInfoA(mh,info._getptr_);
+            return info.rcmonitor;
+        end 
         rc := new tcrect();
         SystemParametersInfoA(0x30,0,rc._getptr_(),0);
         return rc._getdata_();
diff --git a/funcext/tvclib/utslvclmemstruct.tsf b/funcext/tvclib/utslvclmemstruct.tsf
index 84a6137..efeae0e 100644
--- a/funcext/tvclib/utslvclmemstruct.tsf
+++ b/funcext/tvclib/utslvclmemstruct.tsf
@@ -1464,9 +1464,6 @@ type Ttagxform=class(tslcstructureobj)
     property edx index 4 read _getvalue_ write _setvalue_;
     property edy index 5 read _getvalue_ write _setvalue_;
 end
-implementation
-(*
-
 type TMONITORINFO=class(tslcstructureobj)
     private
     static SSTRUCT;
@@ -1492,6 +1489,8 @@ type TMONITORINFO=class(tslcstructureobj)
     property rcwork index "rcwork" read _getvalue_ write _setvalue_;
     property dwflags index "dwflags" read _getvalue_ write _setvalue_;
 end
+implementation
+(*
 
 //������,״̬��
 type ttagNMCUSTOMDRAWINFO=class(tslcstructureobj)
diff --git a/funcext/tvclib/utslvclstdctl.tsf b/funcext/tvclib/utslvclstdctl.tsf
index 9619d03..1c5e3b3 100644
--- a/funcext/tvclib/utslvclstdctl.tsf
+++ b/funcext/tvclib/utslvclstdctl.tsf
@@ -4055,7 +4055,7 @@ type TCustomComboBoxbase=class(TCustomControl)
         inherited;
         FBtnWidth := 20;
         FmaxListItemShow := 10;
-        FScreenRect := _wapi.GetScreenRect();
+        //FScreenRect := _wapi.GetScreenRect();
         FListBox := CreateAlist();
         if FListBox is class(TWinControl)then
         begin
@@ -4164,24 +4164,24 @@ type TCustomComboBoxbase=class(TCustomControl)
         **}
         if not(FListBox is class(TWinControl))then return;
         rc := ClientRect;
-        FListbox.height :=  getlistitemheight()* (min(max(0,getlistitemcount()),FmaxListItemShow))+10;
+        h := getlistitemheight()* (min(max(0,getlistitemcount()),FmaxListItemShow))+10;
+        FListbox.height :=  h;
         nrc := ClientToScreen(rc[0],rc[3]);
-        if FScreenRect[3]-nrc[1]<250 then
+        src := _wapi.GetScreenRect(nrc);
+        p2 := clienttoscreen(rc[0],rc[1]+h);
+        if src[3]<p2[1] then
         begin
-            nrc[2]:= width+nrc[0];
-            nrc[3]:= nrc[1]-height;
-            nrc[1]:= nrc[3]-FListBox.Height;
-        end else
-        begin
-            nrc[2]:= width+nrc[0];
-            nrc[3]:= FListBox.Height+nrc[1];
-        end
-        FListBox.SetBoundsRect(nrc);
+            nrc := ClientToScreen(rc[0],rc[1]-h);
+        end 
+        FListBox.Width := Width;
+        FListBox.left := nrc[0];
+        FListBox.top := nrc[1];
+        
     end
     FListBox;
     private
     FmaxListItemShow;
-    FScreenRect; //��������
+    //FScreenRect; //��������
     FBtnRect; //��ť����
     weakref
     FOnSelchanged; //ѡ��ı�
diff --git a/funcext/tvclib/uwindowsinterface.tsf b/funcext/tvclib/uwindowsinterface.tsf
index bed239c..f339dcf 100644
--- a/funcext/tvclib/uwindowsinterface.tsf
+++ b/funcext/tvclib/uwindowsinterface.tsf
@@ -248,6 +248,8 @@ type twindowsapi = class()
     			
     //��ʱ��
     //function SetClassLongA(hWnd:pointer; nIDEvent:pointer):integer;stdcall;external "User32.dll"  name " SetClassLongA"; 
+    function MonitorFromRect(rec :array of integer;dwFlags:integer):pointer;stdcall;external "User32.dll"  name "MonitorFromRect";
+    function MonitorFromPoint(rec:pointer;dwFlags:integer):pointer;stdcall;external "User32.dll"  name "MonitorFromPoint";
     function GetDpiFromDpiAwarenessContext(v:pointer):integer;stdcall;external "User32.dll"  name "GetDpiFromDpiAwarenessContext";
     function GetDpiForWindow(hwnd:pointer):integer;stdcall;external "User32.dll"  name "GetDpiForWindow";
     function GetMonitorInfoA(hMonitor:pointer;lpmi:pointer):integer;stdcall;external "User32.dll"  name "GetMonitorInfoA";
@@ -725,10 +727,10 @@ begin
     begin
         g_windows_proc_handle := makeinstance(thisfunction(tslvclproc));
     end  
-    try 
+    {try 
         SetProcessDpiAwareness(2); //shez dpi��֪
     except
-    end    
+    end }   
 end 
 function uninit();//�
 begin