Fix the lookin combobox overlapping the toolbar in open/save file
dialog.
This commit is contained in:
parent
b27587dd0a
commit
473a88661e
|
@ -1030,6 +1030,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
|
||||||
};
|
};
|
||||||
TBADDBITMAP tba[2];
|
TBADDBITMAP tba[2];
|
||||||
RECT rectTB;
|
RECT rectTB;
|
||||||
|
RECT rectlook;
|
||||||
FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
|
FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
|
||||||
|
|
||||||
tba[0].hInst = HINST_COMMCTRL;
|
tba[0].hInst = HINST_COMMCTRL;
|
||||||
|
@ -1055,10 +1056,18 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
|
||||||
fodInfos->DlgInfos.hwndFileTypeCB = GetDlgItem(hwnd,IDC_FILETYPE);
|
fodInfos->DlgInfos.hwndFileTypeCB = GetDlgItem(hwnd,IDC_FILETYPE);
|
||||||
fodInfos->DlgInfos.hwndLookInCB = GetDlgItem(hwnd,IDC_LOOKIN);
|
fodInfos->DlgInfos.hwndLookInCB = GetDlgItem(hwnd,IDC_LOOKIN);
|
||||||
|
|
||||||
|
GetWindowRect( fodInfos->DlgInfos.hwndLookInCB,&rectlook);
|
||||||
|
MapWindowPoints( 0, hwnd,(LPPOINT)&rectlook,2);
|
||||||
|
|
||||||
/* construct the toolbar */
|
/* construct the toolbar */
|
||||||
GetWindowRect(GetDlgItem(hwnd,IDC_TOOLBARSTATIC),&rectTB);
|
GetWindowRect(GetDlgItem(hwnd,IDC_TOOLBARSTATIC),&rectTB);
|
||||||
MapWindowPoints( 0, hwnd,(LPPOINT)&rectTB,2);
|
MapWindowPoints( 0, hwnd,(LPPOINT)&rectTB,2);
|
||||||
|
|
||||||
|
rectTB.right = rectlook.right + rectTB.right - rectTB.left;
|
||||||
|
rectTB.bottom = rectlook.top - 1 + rectTB.bottom - rectTB.top;
|
||||||
|
rectTB.left = rectlook.right;
|
||||||
|
rectTB.top = rectlook.top-1;
|
||||||
|
|
||||||
fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL,
|
fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL,
|
||||||
WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
|
WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
|
||||||
0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL);
|
0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL);
|
||||||
|
|
Loading…
Reference in New Issue