Skip to content

W
wine-winehq
Commit 3a59a4d1 authored by Jactry Zeng's avatar Jactry Zeng Committed by Alexandre Julliard
Browse files
Options

comdlg32: Set a size for toolbar buttons of the file access dialog.

The default size is too small for HiDPI, so set the same height as the look-in combo box to it. And since in owner draw mode, the height of combo box is calculated and updated when drawing items, this patch set button height for toolbar from FILEDLG95_LOOKIN_DrawItem() too.
parent 80b332c0
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 5 deletions
dlls/comdlg32/filedlg.c
View file @ 3a59a4d1
...@@ -180,7 +180,7 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd); ...@@ -180,7 +180,7 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd);
/* Functions used by the Look In combo box */ /* Functions used by the Look In combo box */
static void FILEDLG95_LOOKIN_Init(HWND hwndCombo); static void FILEDLG95_LOOKIN_Init(HWND hwndCombo);
static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct); static LRESULT FILEDLG95_LOOKIN_DrawItem(HWND hwnd, LPDRAWITEMSTRUCT pDIStruct);
static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode); static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode);
static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId); static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId);
static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMethod); static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMethod);
...@@ -1392,7 +1392,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l ...@@ -1392,7 +1392,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
switch(((LPDRAWITEMSTRUCT)lParam)->CtlID) switch(((LPDRAWITEMSTRUCT)lParam)->CtlID)
{ {
case IDC_LOOKIN: case IDC_LOOKIN:
FILEDLG95_LOOKIN_DrawItem((LPDRAWITEMSTRUCT) lParam); FILEDLG95_LOOKIN_DrawItem(hwnd, (LPDRAWITEMSTRUCT)lParam);
return TRUE; return TRUE;
} }
} }
...@@ -3368,13 +3368,12 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) ...@@ -3368,13 +3368,12 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo)
* *
* WM_DRAWITEM message handler * WM_DRAWITEM message handler
*/ */
static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) static LRESULT FILEDLG95_LOOKIN_DrawItem(HWND hwnd, LPDRAWITEMSTRUCT pDIStruct)
{ {
COLORREF crWin = GetSysColor(COLOR_WINDOW); COLORREF crWin = GetSysColor(COLOR_WINDOW);
COLORREF crHighLight = GetSysColor(COLOR_HIGHLIGHT); COLORREF crHighLight = GetSysColor(COLOR_HIGHLIGHT);
COLORREF crText = GetSysColor(COLOR_WINDOWTEXT); COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
RECT rectText; RECT rectText, rectIcon, lookin_rect;
RECT rectIcon;
SHFILEINFOW sfi; SHFILEINFOW sfi;
HIMAGELIST ilItemImage; HIMAGELIST ilItemImage;
int iIndentation; int iIndentation;
...@@ -3382,6 +3381,8 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) ...@@ -3382,6 +3381,8 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct)
LPSFOLDER tmpFolder; LPSFOLDER tmpFolder;
UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME; UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME;
UINT icon_width, icon_height; UINT icon_width, icon_height;
FileOpenDlgInfos *dialog;
int height;
TRACE("\n"); TRACE("\n");
...@@ -3452,6 +3453,12 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) ...@@ -3452,6 +3453,12 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct)
/* Draw the associated text */ /* Draw the associated text */
TextOutW(pDIStruct->hDC,rectText.left,rectText.top,sfi.szDisplayName,lstrlenW(sfi.szDisplayName)); TextOutW(pDIStruct->hDC,rectText.left,rectText.top,sfi.szDisplayName,lstrlenW(sfi.szDisplayName));
dialog = get_filedlg_infoptr(hwnd);
GetWindowRect(dialog->DlgInfos.hwndLookInCB, &lookin_rect);
height = lookin_rect.bottom - lookin_rect.top;
SendMessageW(dialog->DlgInfos.hwndTB, TB_SETBUTTONSIZE, 0, MAKELPARAM(height, height));
return NOERROR; return NOERROR;
} }
......
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