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

Carbon: implemented wsFullScreen. issue #19522

Browse Source 
git-svn-id: trunk@31554 -
This commit is contained in:
zeljko 2011-07-04 10:28:06 +00:00
parent fed392d7ed
commit 6d93bd06bb
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lcl/interfaces/carbon/carbonprivatewindow.inc
View File

@ -1846,6 +1846,9 @@ function TCarbonWindow.Show(AShow: Integer): Boolean;
var
P: MacOSAll.Point;
Maximized: Boolean;
FullScreen: Boolean;
UIMode: SystemUIMode;
UIOptions: SystemUIOptions;
const
SName = 'Show';
SCollapse = 'CollapseWindow';
@ -1857,7 +1860,7 @@ begin
//DebugLn('TCarbonWindow.Show ' + DbgS(AShow));
case AShow of
SW_SHOWNORMAL, SW_SHOWMAXIMIZED:
SW_SHOWNORMAL, SW_SHOWMAXIMIZED, SW_SHOWFULLSCREEN:
begin
if IsWindowCollapsed(fWindowRef) then
if OSError(CollapseWindow(fWindowRef, False),
@ -1865,22 +1868,36 @@ begin
// for checking if any change is necessary
Maximized := IsWindowInStandardState(fWindowRef, nil, nil);
GetSystemUIMode(@UIMode, @UIOptions);
FullScreen := (UIMode = kuiModeAllHidden) and (UIOptions = kUIOptionAutoShowMenuBar);
if AShow = SW_SHOWNORMAL then
if FullScreen then
begin
SetSystemUIMode(kuiModeNormal, 0);
if OSError(ZoomWindowIdeal(fWindowRef, inZoomIn, P),
Self, SName, SZoomIdeal, 'inZoomIn') then Exit;
exit(True);
end;
if (AShow = SW_SHOWNORMAL) then
begin
if Maximized then
if OSError(ZoomWindowIdeal(fWindowRef, inZoomIn, P),
Self, SName, SZoomIdeal, 'inZoomIn') then Exit;
end
else
if not Maximized then
begin
if AShow = SW_SHOWFULLSCREEN then
SetSystemUIMode(kuiModeAllHidden, kUIOptionAutoShowMenuBar);
if not Maximized or (AShow = SW_SHOWFULLSCREEN) then
begin
P.v := $3FFF;
P.h := $3FFF;
if OSError(ZoomWindowIdeal(fWindowRef, inZoomOut, P),
Self, SName, SZoomIdeal, 'inZoomOut') then Exit;
end;
end;
SetForeground;
end;
SW_MINIMIZE:

1
lcl/interfaces/carbon/carbonwsforms.pp
View File

@ -214,6 +214,7 @@ begin
if AWinControl.HandleObjectShouldBeVisible then
begin
case TCustomForm(AWinControl).WindowState of
wsFullScreen: nCmdShow := SW_SHOWFULLSCREEN;
wsMaximized: nCmdShow := SW_SHOWMAXIMIZED;
wsMinimized: nCmdShow := SW_SHOWMINIMIZED;
else