Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 00:23:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHIMGVW] Improve window size handling

Browse source 
CORE-19358
This commit is contained in:
Katayama Hirofumi MZ 2023-12-08 14:56:12 +09:00
parent a500b513b0
commit 77ab709b61
2 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

41
dll/win32/shimgvw/shimgvw.c
View file

@ -829,6 +829,12 @@ ImageView_LoadSettings(VOID)
DWORD dwSize; DWORD dwSize;
LONG nError; LONG nError;
shiSettings.Maximized = FALSE;
shiSettings.X = CW_USEDEFAULT;
shiSettings.Y = CW_USEDEFAULT;
shiSettings.Width = 520;
shiSettings.Height = 400;
nError = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\shimgvw", 0, KEY_READ, &hKey); nError = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\shimgvw", 0, KEY_READ, &hKey);
if (nError) if (nError)
return FALSE; return FALSE;
@ -845,16 +851,17 @@ ImageView_SaveSettings(HWND hwnd)
{ {
WINDOWPLACEMENT wp; WINDOWPLACEMENT wp;
HKEY hKey; HKEY hKey;
RECT *prc;
ShowWindow(hwnd, SW_HIDE);
wp.length = sizeof(WINDOWPLACEMENT); wp.length = sizeof(WINDOWPLACEMENT);
GetWindowPlacement(hwnd, &wp); GetWindowPlacement(hwnd, &wp);
shiSettings.Left = wp.rcNormalPosition.left; prc = &wp.rcNormalPosition;
shiSettings.Top = wp.rcNormalPosition.top; shiSettings.X = prc->left;
shiSettings.Right = wp.rcNormalPosition.right; shiSettings.Y = prc->top;
shiSettings.Bottom = wp.rcNormalPosition.bottom; shiSettings.Width = prc->right - prc->left;
shiSettings.Maximized = (IsZoomed(hwnd) || (wp.flags & WPF_RESTORETOMAXIMIZED)); shiSettings.Height = prc->bottom - prc->top;
shiSettings.Maximized = IsZoomed(hwnd);
if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\ReactOS\\shimgvw"), 0, NULL, if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\ReactOS\\shimgvw"), 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS)
@ -940,12 +947,6 @@ ImageView_DispWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
static VOID static VOID
ImageView_InitControls(HWND hwnd) ImageView_InitControls(HWND hwnd)
{ {
MoveWindow(hwnd, shiSettings.Left, shiSettings.Top,
shiSettings.Right - shiSettings.Left,
shiSettings.Bottom - shiSettings.Top, TRUE);
if (shiSettings.Maximized) ShowWindow(hwnd, SW_MAXIMIZE);
hDispWnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, L"", hDispWnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, L"",
WS_CHILD | WS_VISIBLE, WS_CHILD | WS_VISIBLE,
0, 0, 0, 0, hwnd, NULL, hInstance, NULL); 0, 0, 0, 0, hwnd, NULL, hInstance, NULL);
@ -1182,14 +1183,7 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName)
DPRINT1("Warning, CoInitializeEx failed with code=%08X\n", (int)hComRes); DPRINT1("Warning, CoInitializeEx failed with code=%08X\n", (int)hComRes);
} }
if (!ImageView_LoadSettings()) ImageView_LoadSettings();
{
shiSettings.Maximized = FALSE;
shiSettings.Left = 0;
shiSettings.Top = 0;
shiSettings.Right = 520;
shiSettings.Bottom = 400;
}
// Initialize GDI+ // Initialize GDI+
gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.GdiplusVersion = 1;
@ -1214,8 +1208,11 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName)
LoadStringW(hInstance, IDS_APPTITLE, szBuf, _countof(szBuf)); LoadStringW(hInstance, IDS_APPTITLE, szBuf, _countof(szBuf));
hMainWnd = CreateWindowExW(WS_EX_WINDOWEDGE, WC_SHIMGVW, szBuf, hMainWnd = CreateWindowExW(WS_EX_WINDOWEDGE, WC_SHIMGVW, szBuf,
WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS, WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS,
CW_USEDEFAULT, CW_USEDEFAULT, shiSettings.X, shiSettings.Y,
0, 0, NULL, NULL, hInstance, NULL); shiSettings.Width, shiSettings.Height,
NULL, NULL, hInstance, NULL);
if (shiSettings.Maximized)
ShowWindow(hMainWnd, SW_MAXIMIZE);
// make sure the path has no quotes on it // make sure the path has no quotes on it
StringCbCopyW(szInitialFile, sizeof(szInitialFile), szFileName); StringCbCopyW(szInitialFile, sizeof(szInitialFile), szFileName);

8
dll/win32/shimgvw/shimgvw.h
View file

@ -8,10 +8,10 @@ extern HINSTANCE hInstance;
typedef struct typedef struct
{ {
BOOL Maximized; BOOL Maximized;
INT Left; INT X;
INT Top; INT Y;
INT Right; INT Width;
INT Bottom; INT Height;
} SHIMGVW_SETTINGS; } SHIMGVW_SETTINGS;
typedef struct SHIMGVW_FILENODE_INTERNAL typedef struct SHIMGVW_FILENODE_INTERNAL