From: Vladislav Timonin timoninvlad@yandex.ru
--- dlls/comdlg32/itemdlg.c | 2 +- dlls/comdlg32/navbar.c | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 625ae0f9cda..c162125f5de 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1904,7 +1904,7 @@ static HRESULT init_explorerbrowser(FileDialogImpl *This)
static void init_toolbar(FileDialogImpl *This, HWND hwnd) { - CreateWindowExW(0, WC_NAVBARW, NULL, WS_CHILD | WS_VISIBLE, + CreateWindowExW(WS_EX_CONTROLPARENT, WC_NAVBARW, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, MulDiv(NAVBAR_HEIGHT, This->dpi_y, USER_DEFAULT_SCREEN_DPI), hwnd, (HMENU)IDC_NAVBAR, NULL, NULL); diff --git a/dlls/comdlg32/navbar.c b/dlls/comdlg32/navbar.c index 23f18764136..14907ed09ab 100644 --- a/dlls/comdlg32/navbar.c +++ b/dlls/comdlg32/navbar.c @@ -287,7 +287,7 @@ static void NAVBAR_CalcLayout(NAVBAR_INFO *info) { if (crumbs_visible_n > 0) { - LONG_PTR style = WS_CHILD | WS_VISIBLE; + LONG_PTR style = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
/* if label doesn't fully fit, align it to the left */ if (crumb->current_w < crumb->full_w) @@ -336,6 +336,12 @@ static HDWP NAVBAR_DoLayout(NAVBAR_INFO *info, HDWP hdwp) can_fit_n -= 1; }
+ /* update the Z order of other buttons for consistent tab order */ + hdwp = DeferWindowPos(hdwp, info->overflow_hwnd, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE); + hdwp = DeferWindowPos(hdwp, info->up_btn_hwnd, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE); + hdwp = DeferWindowPos(hdwp, info->fwd_btn_hwnd, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE); + hdwp = DeferWindowPos(hdwp, info->back_btn_hwnd, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE); + split_info.mask = BCSIF_STYLE;
if (GetMenuItemCount(info->overflow_menu) > 0) @@ -391,7 +397,7 @@ static LRESULT NAVBAR_Create(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
x = 0; info->back_btn_hwnd = CreateWindowExW(0, WC_BUTTONW, NULL, - WS_CHILD | WS_VISIBLE | BS_ICON | BS_BITMAP, + WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_ICON | BS_BITMAP, x, 0, cs->cy, cs->cy, hwnd, (HMENU)IDC_NAVBACK, COMDLG32_hInstance, NULL); SendMessageW(info->back_btn_hwnd, WM_SETFONT, (WPARAM)gui_font, FALSE); @@ -400,7 +406,7 @@ static LRESULT NAVBAR_Create(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
x += cs->cy + gap; info->fwd_btn_hwnd = CreateWindowExW(0, WC_BUTTONW, NULL, - WS_CHILD | WS_VISIBLE | BS_ICON | BS_BITMAP, + WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_ICON | BS_BITMAP, x, 0, cs->cy, cs->cy, hwnd, (HMENU)IDC_NAVFORWARD, COMDLG32_hInstance, NULL); SendMessageW(info->fwd_btn_hwnd, WM_SETFONT, (WPARAM)gui_font, FALSE); @@ -409,7 +415,7 @@ static LRESULT NAVBAR_Create(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
x += cs->cy + gap; info->up_btn_hwnd = CreateWindowExW(0, WC_BUTTONW, NULL, - WS_CHILD | WS_VISIBLE | BS_ICON | BS_BITMAP, + WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_ICON | BS_BITMAP, x, 0, cs->cy, cs->cy, hwnd, (HMENU)IDC_NAVUP, COMDLG32_hInstance, NULL); SendMessageW(info->up_btn_hwnd, WM_SETFONT, (WPARAM)gui_font, FALSE); @@ -424,7 +430,7 @@ static LRESULT NAVBAR_Create(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) SetWindowSubclass(info->frame_hwnd, NAVBAR_FRAME_SubclassProc, FRAME_SUBCLASS_ID, (DWORD_PTR)info);
info->overflow_hwnd = CreateWindowExW(0, WC_BUTTONW, NULL, - WS_CHILD | WS_VISIBLE | BS_ICON | BS_SPLITBUTTON, + WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_ICON | BS_SPLITBUTTON, x, 0, cs->cy + MulDiv(6, info->dpi_x, USER_DEFAULT_SCREEN_DPI), cs->cy, hwnd, (HMENU)IDC_OVERFLOW, COMDLG32_hInstance, NULL); SendMessageW(info->overflow_hwnd, WM_SETFONT, (WPARAM)gui_font, FALSE); @@ -468,7 +474,7 @@ static LRESULT NAVBAR_Size(HWND hwnd, NAVBAR_INFO *info, UINT msg, WPARAM wparam
NAVBAR_CalcLayout(info);
- hdwp = BeginDeferWindowPos(info->crumbs_total_n + 1); + hdwp = BeginDeferWindowPos(info->crumbs_total_n + 5); hdwp = NAVBAR_DoLayout(info, hdwp); EndDeferWindowPos(hdwp);
@@ -563,7 +569,7 @@ static LRESULT NAVBAR_SetPIDL(HWND hwnd, NAVBAR_INFO *info, UINT msg, WPARAM wpa IShellFolder_GetDisplayNameOf(desktop, pidl, SHGDN_FORADDRESSBAR, &strret); StrRetToStrW(&strret, pidl, &crumb1->display_name);
- crumb1->hwnd = CreateWindowExW(0, WC_BUTTONW, crumb1->display_name, WS_CHILD, + crumb1->hwnd = CreateWindowExW(0, WC_BUTTONW, crumb1->display_name, WS_CHILD | WS_TABSTOP, 0, 0, 0, 0, info->container_hwnd, (HMENU)IDC_NAVCRUMB, COMDLG32_hInstance, NULL); SendMessageW(crumb1->hwnd, WM_SETFONT, (LPARAM)gui_font, FALSE); @@ -627,7 +633,7 @@ static LRESULT NAVBAR_SetPIDL(HWND hwnd, NAVBAR_INFO *info, UINT msg, WPARAM wpa
NAVBAR_CalcLayout(info);
- hdwp = BeginDeferWindowPos(info->crumbs_total_n + 1); + hdwp = BeginDeferWindowPos(info->crumbs_total_n + 5); hdwp = NAVBAR_DoLayout(info, hdwp); EndDeferWindowPos(hdwp);