paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-17 14:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: Refactoring, combine identical code in TScreen to a function.

Browse Source 
git-svn-id: trunk@54465 -
This commit is contained in:
juha 2017-03-22 17:17:21 +00:00
parent d3f3c58edc
commit 93da17aa07
2 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/forms.pp
View File

@ -1068,6 +1068,8 @@ type
procedure SetIconFont(const AValue: TFont);
procedure SetMenuFont(const AValue: TFont);
procedure SetSystemFont(const AValue: TFont);
function UpdatedMonitor(AHandle: HMONITOR; ADefault: TMonitorDefaultTo;
AErrorMsg: string): TMonitor;
procedure UpdateLastActive;
procedure RestoreLastActive;
procedure AddHandler(HandlerType: TScreenNotification;

66
lcl/include/screen.inc
View File

@ -413,6 +413,22 @@ begin
FreeAndNil(AFormList);
end;
function TScreen.UpdatedMonitor(AHandle: HMONITOR; ADefault: TMonitorDefaultTo;
AErrorMsg: string): TMonitor;
var
i: Integer;
begin
Result := nil;
if (AHandle = 0) and (ADefault = mdNull) then
Exit;
// the user expects some monitor but handle wasn't found -> the monitor list has probably changed
UpdateMonitors;
for i := 0 to MonitorCount - 1 do
if Monitors[i].Handle = AHandle then
Exit(Monitors[i]);
RaiseGDBException(AErrorMsg); // internal error
end;
function TScreen.MonitorFromPoint(const Point: TPoint;
MonitorDefault: TMonitorDefaultTo): TMonitor;
var
@ -431,17 +447,7 @@ begin
Result := MonitorFromRect(R, MonitorDefault);
end
else
if (MonitorHandle = 0) and (MonitorDefault = mdNull) then
Result := nil
else
begin
// the user expects some monitor but handle wasn't found -> the monitor list has probably changed
UpdateMonitors;
for i := 0 to MonitorCount - 1 do
if Monitors[i].Handle = MonitorHandle then
Exit(Monitors[i]);
RaiseGDBException('TScreen.MonitorFromPoint'); // internal error
end;
Result := UpdatedMonitor(MonitorHandle, MonitorDefault, 'TScreen.MonitorFromPoint');
end;
function TScreen.MonitorFromRect(const Rect: TRect;
@ -485,28 +491,14 @@ begin
end;
end;
if Result = nil then
begin
if MonitorDefault = mdPrimary then
Result := PrimaryMonitor
else
if MonitorDefault = mdNull then
Result := nil
else
Result := Nearest;
end;
case MonitorDefault of
mdPrimary: Result := PrimaryMonitor;
mdNull : Result := nil;
mdNearest: Result := Nearest;
end;
end
else
if (MonitorHandle = 0) and (MonitorDefault = mdNull) then
Result := nil
else
begin
// the user expects some monitor but handle wasn't found -> the monitor list has probably changed
UpdateMonitors;
for i := 0 to MonitorCount - 1 do
if Monitors[i].Handle = MonitorHandle then
Exit(Monitors[i]);
RaiseGDBException('TScreen.MonitorFromRect'); // internal error
end;
Result := UpdatedMonitor(MonitorHandle, MonitorDefault, 'TScreen.MonitorFromRect');
end;
function TScreen.MonitorFromWindow(const Handle: THandle;
@ -526,17 +518,7 @@ begin
Result := MonitorFromRect(R, MonitorDefault);
end
else
if (MonitorHandle = 0) and (MonitorDefault = mdNull) then
Result := nil
else
begin
// the user expects some monitor but handle wasn't found -> the monitor list has probably changed
UpdateMonitors;
for i := 0 to MonitorCount - 1 do
if Monitors[i].Handle = MonitorHandle then
Exit(Monitors[i]);
RaiseGDBException('TScreen.MonitorFromWindow'); // internal error
end;
Result := UpdatedMonitor(MonitorHandle, MonitorDefault, 'TScreen.MonitorFromWindow');
end;
procedure GetScreenFontsList(FontList: TStrings);