Skip to content

W
wine-winehq
Commit abe87675 authored by Mikołaj Zalewski's avatar Mikołaj Zalewski Committed by Alexandre Julliard
Browse files
Options

shell32: Make new style Browse For Folders dialog resizable.

parent d7999a00
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 13 deletions
dlls/shell32/brsfolder.c
View file @ abe87675
......@@ -20,7 +20,6 @@
* - many flags unimplemented
* - implement new dialog style "make new folder" button
* - implement editbox
* - implement new dialog style resizing
*/
#include <stdlib.h>
......@@ -39,12 +38,21 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* original margins and control size */
typedef struct tagLAYOUT_DATA
{
LONG left, width, right;
LONG top, height, bottom;
} LAYOUT_DATA;
typedef struct tagbrowse_info
{
HWND hWnd;
HWND hwndTreeView;
LPBROWSEINFOW lpBrowseInfo;
LPITEMIDLIST pidlRet;
LAYOUT_DATA *layout; /* filled by LayoutInit, used by LayoutUpdate */
SIZE szMin;
} browse_info;
typedef struct tagTV_ITEMDATA
......@@ -55,6 +63,26 @@ typedef struct tagTV_ITEMDATA
IEnumIDList* pEnumIL; /* Children iterator */
} TV_ITEMDATA, *LPTV_ITEMDATA;
typedef struct tagLAYOUT_INFO
{
int iItemId; /* control id */
DWORD dwAnchor; /* BF_* flags specifying which margins should remain constant */
} LAYOUT_INFO;
static const LAYOUT_INFO g_layout_info[] =
{
{IDD_TITLE, BF_TOP|BF_LEFT|BF_RIGHT},
{IDD_STATUS, BF_TOP|BF_LEFT|BF_RIGHT},
{IDD_FOLDER, BF_TOP|BF_LEFT|BF_RIGHT},
{IDD_TREEVIEW, BF_TOP|BF_BOTTOM|BF_LEFT|BF_RIGHT},
{IDD_FOLDERTEXT, BF_BOTTOM|BF_LEFT|BF_RIGHT},
{IDD_MAKENEWFOLDER, BF_BOTTOM|BF_LEFT},
{IDOK, BF_BOTTOM|BF_RIGHT},
{IDCANCEL, BF_BOTTOM|BF_RIGHT}
};
#define LAYOUT_INFO_COUNT (sizeof(g_layout_info)/sizeof(g_layout_info[0]))
#define SUPPORTEDFLAGS (BIF_STATUSTEXT | \
BIF_BROWSEFORCOMPUTER | \
BIF_RETURNFSANCESTORS | \
......@@ -87,6 +115,68 @@ static void browsefolder_callback( LPBROWSEINFOW lpBrowseInfo, HWND hWnd,
lpBrowseInfo->lpfn( hWnd, msg, param, lpBrowseInfo->lParam );
}
static LAYOUT_DATA *LayoutInit(HWND hwnd, const LAYOUT_INFO *layout_info, int layout_count)
{
LAYOUT_DATA *data;
RECT rcWnd;
int i;
GetClientRect(hwnd, &rcWnd);
data = SHAlloc(sizeof(LAYOUT_DATA)*layout_count);
for (i = 0; i < layout_count; i++)
{
RECT r;
HWND hItem = GetDlgItem(hwnd, layout_info[i].iItemId);
if (hItem == NULL)
ERR("Item %d not found\n", i);
GetWindowRect(hItem, &r);
MapWindowPoints(HWND_DESKTOP, hwnd, (LPPOINT)&r, 2);
data[i].left = r.left;
data[i].right = rcWnd.right - r.right;
data[i].width = r.right - r.left;
data[i].top = r.top;
data[i].bottom = rcWnd.bottom - r.bottom;
data[i].height = r.bottom - r.top;
}
return data;
}
static void LayoutUpdate(HWND hwnd, LAYOUT_DATA *data, const LAYOUT_INFO *layout_info, int layout_count)
{
RECT rcWnd;
int i;
GetClientRect(hwnd, &rcWnd);
for (i = 0; i < layout_count; i++)
{
RECT r;
HWND hItem = GetDlgItem(hwnd, layout_info[i].iItemId);
GetWindowRect(hItem, &r);
MapWindowPoints(HWND_DESKTOP, hwnd, (LPPOINT)&r, 2);
if (layout_info[i].dwAnchor & BF_RIGHT)
{
r.right = rcWnd.right - data[i].right;
if (!(layout_info[i].dwAnchor & BF_LEFT))
r.left = r.right - data[i].width;
}
if (layout_info[i].dwAnchor & BF_BOTTOM)
{
r.bottom = rcWnd.bottom - data[i].bottom;
if (!(layout_info[i].dwAnchor & BF_TOP))
r.top = r.bottom - data[i].height;
}
SetWindowPos(hItem, NULL, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_NOZORDER);
}
}
/******************************************************************************
* InitializeTreeView [Internal]
*
......@@ -504,6 +594,18 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info )
if (lpBrowseInfo->ulFlags & ~SUPPORTEDFLAGS)
FIXME("flags %x not implemented\n", lpBrowseInfo->ulFlags & ~SUPPORTEDFLAGS);
if (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE)
{
RECT rcWnd;
info->layout = LayoutInit(hWnd, g_layout_info, LAYOUT_INFO_COUNT);
/* TODO: Windows allows shrinking the windows a bit */
GetWindowRect(hWnd, &rcWnd);
info->szMin.cx = rcWnd.right - rcWnd.left;
info->szMin.cy = rcWnd.bottom - rcWnd.top;
}
if (lpBrowseInfo->lpszTitle)
SetWindowTextW( GetDlgItem(hWnd, IDD_TITLE), lpBrowseInfo->lpszTitle );
else
......@@ -682,6 +784,18 @@ static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL
return result;
}
static BOOL BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos)
{
if ((info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) && !(pos->flags & SWP_NOSIZE))
{
if (pos->cx < info->szMin.cx)
pos->cx = info->szMin.cx;
if (pos->cy < info->szMin.cy)
pos->cy = info->szMin.cy;
}
return 0;
}
/*************************************************************************
* BrsFolderDlgProc32 (not an exported API function)
*/
......@@ -705,6 +819,14 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
case WM_COMMAND:
return BrsFolder_OnCommand( info, wParam );
case WM_WINDOWPOSCHANGING:
return BrsFolder_OnWindowPosChanging( info, (WINDOWPOS *)lParam);
case WM_SIZE:
if (info->layout) /* new style dialogs */
LayoutUpdate(hWnd, info->layout, g_layout_info, LAYOUT_INFO_COUNT);
return 0;
case BFFM_SETSTATUSTEXTA:
TRACE("Set status %s\n", debugstr_a((LPSTR)lParam));
SetWindowTextA(GetDlgItem(hWnd, IDD_STATUS), (LPSTR)lParam);
......
dlls/shell32/shell32_Da.rc
View file @ abe87675
......@@ -107,7 +107,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "Vlg Folder"
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_De.rc
View file @ abe87675
......@@ -107,7 +107,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "Verzeichnis auswhlen"
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_En.rc
View file @ abe87675
......@@ -106,7 +106,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "Browse for Folder"
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_Es.rc
View file @ abe87675
......@@ -107,7 +107,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "Explorar carpeta"
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_Fr.rc
View file @ abe87675
......@@ -112,7 +112,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "Parcourir les dossiers"
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_Ko.rc
View file @ abe87675
......@@ -108,7 +108,7 @@ WS_BORDER | WS_TABSTOP,
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "폴더 탐색"
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_Nl.rc
View file @ abe87675
......@@ -108,7 +108,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "Bladeren naar Map"
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_No.rc
View file @ abe87675
......@@ -106,7 +106,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "Bla etter mappe"
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_Pl.rc
View file @ abe87675
......@@ -107,7 +107,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "Wybierz folder"
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_Ro.rc
View file @ abe87675
......@@ -109,7 +109,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "Selectare dosar"
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_Ru.rc
View file @ abe87675
......@@ -107,7 +107,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION ""
FONT 8, "MS Shell Dlg"
{
......
dlls/shell32/shell32_Si.rc
View file @ abe87675
......@@ -108,7 +108,7 @@ FONT 8, "MS Shell Dlg"
}
SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
CAPTION "Brskanje po mapah"
FONT 8, "MS Shell Dlg"
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment