Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS] Fix maximizing. By Ismael Ferreras Morezuelas. CORE-9060

Browse source 
svn path=/trunk/; revision=66591
This commit is contained in:
Amine Khaldi 2015-03-06 20:23:45 +00:00
parent 4f727bf356
commit a565167c59
2 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/applications/rapps/rapps.h
View file

@ -102,8 +102,8 @@ typedef struct
BOOL Maximized;
INT Left;
INT Top;
INT Right;
INT Bottom;
INT Width;
INT Height;
} SETTINGS_INFO, *PSETTINGS_INFO;

42
reactos/base/applications/rapps/winmain.c
View file

@ -42,10 +42,10 @@ FillDefaultSettings(PSETTINGS_INFO pSettingsInfo)
pSettingsInfo->bDelInstaller = FALSE;
pSettingsInfo->Maximized = FALSE;
pSettingsInfo->Left = 0;
pSettingsInfo->Top = 0;
pSettingsInfo->Right = 680;
pSettingsInfo->Bottom = 450;
pSettingsInfo->Left = CW_USEDEFAULT;
pSettingsInfo->Top = CW_USEDEFAULT;
pSettingsInfo->Width = 680;
pSettingsInfo->Height = 450;
}
static BOOL
@ -82,9 +82,9 @@ SaveSettings(HWND hwnd)
SettingsInfo.Left = wp.rcNormalPosition.left;
SettingsInfo.Top = wp.rcNormalPosition.top;
SettingsInfo.Right = wp.rcNormalPosition.right;
SettingsInfo.Bottom = wp.rcNormalPosition.bottom;
SettingsInfo.Maximized = (IsZoomed(hwnd) || (wp.flags & WPF_RESTORETOMAXIMIZED));
SettingsInfo.Width = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
SettingsInfo.Height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
SettingsInfo.Maximized = (wp.showCmd == SW_MAXIMIZE || (wp.showCmd == SW_SHOWMINIMIZED && (wp.flags & WPF_RESTORETOMAXIMIZED)));
}
if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, NULL,
@ -333,20 +333,12 @@ InitCategoriesList(VOID)
BOOL
InitControls(HWND hwnd)
{
if (SettingsInfo.bSaveWndPos)
{
MoveWindow(hwnd, SettingsInfo.Left, SettingsInfo.Top,
SettingsInfo.Right - SettingsInfo.Left,
SettingsInfo.Bottom - SettingsInfo.Top, TRUE);
if (SettingsInfo.Maximized) ShowWindow(hwnd, SW_MAXIMIZE);
}
if (CreateStatusBar(hwnd) &&
CreateToolBar(hwnd) &&
CreateListView(hwnd) &&
CreateTreeView(hwnd) &&
CreateRichEdit(hwnd) &&
CreateToolBar(hwnd) &&
CreateListView(hwnd) &&
CreateTreeView(hwnd) &&
CreateRichEdit(hwnd) &&
CreateVSplitBar(hwnd) &&
CreateHSplitBar(hwnd))
{
@ -959,10 +951,10 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nSh
szWindowClass,
szWindowName,
WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
CW_USEDEFAULT,
CW_USEDEFAULT,
680,
450,
(SettingsInfo.bSaveWndPos ? SettingsInfo.Left : CW_USEDEFAULT),
(SettingsInfo.bSaveWndPos ? SettingsInfo.Top : CW_USEDEFAULT),
(SettingsInfo.bSaveWndPos ? SettingsInfo.Width : 680),
(SettingsInfo.bSaveWndPos ? SettingsInfo.Height : 450),
NULL,
NULL,
hInstance,
@ -970,8 +962,8 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nSh
if (!hMainWnd) goto Exit;
/* Show it */
ShowWindow(hMainWnd, nShowCmd);
/* Maximize it if we must */
ShowWindow(hMainWnd, (SettingsInfo.bSaveWndPos && SettingsInfo.Maximized ? SW_MAXIMIZE : nShowCmd));
UpdateWindow(hMainWnd);
if (SettingsInfo.bUpdateAtStart)