extern void ResizeWnd(int cx, int cy)
{
- HDWP hdwp = BeginDeferWindowPos(3);
+ HDWP hdwp = BeginDeferWindowPos(4);
RECT rt, rs, rb;
- const int tHeight = 22;
+ const int nButtonWidth = 44;
+ const int nButtonHeight = 22;
+ int cyEdge = GetSystemMetrics(SM_CYEDGE);
+ const UINT uFlags = SWP_NOZORDER | SWP_NOACTIVATE;
SetRect(&rt, 0, 0, cx, cy);
cy = 0;
if (hStatusBar != NULL)
cy = rs.bottom - rs.top;
}
GetWindowRect(g_pChildWnd->hAddressBtnWnd, &rb);
- cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH/2;
- DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - 2*tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
- DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, 0, rt.right - 2*tHeight, rt.top, 2*tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
- DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, g_pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
- DeferWindowPos(hdwp, g_pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
- EndDeferWindowPos(hdwp);
+ cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH / 2;
+ if (hdwp)
+ hdwp = DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, NULL,
+ rt.left, rt.top,
+ rt.right - rt.left - nButtonWidth, nButtonHeight,
+ uFlags);
+ if (hdwp)
+ hdwp = DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, NULL,
+ rt.right - nButtonWidth, rt.top,
+ nButtonWidth, nButtonHeight,
+ uFlags);
+ if (hdwp)
+ hdwp = DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, NULL,
+ rt.left,
+ rt.top + nButtonHeight + cyEdge,
+ g_pChildWnd->nSplitPos - SPLIT_WIDTH/2 - rt.left,
+ rt.bottom - rt.top - cy - 2 * cyEdge,
+ uFlags);
+ if (hdwp)
+ hdwp = DeferWindowPos(hdwp, g_pChildWnd->hListWnd, NULL,
+ rt.left + cx,
+ rt.top + nButtonHeight + cyEdge,
+ rt.right - cx,
+ rt.bottom - rt.top - cy - 2 * cyEdge,
+ uFlags);
+ if (hdwp)
+ EndDeferWindowPos(hdwp);
}
/*******************************************************************************
ReleaseDC(hWnd, hdc);
}
-static void OnPaint(HWND hWnd)
-{
- PAINTSTRUCT ps;
- RECT rt;
-
- GetClientRect(hWnd, &rt);
- BeginPaint(hWnd, &ps);
- FillRect(ps.hdc, &rt, GetSysColorBrush(COLOR_BTNFACE));
- EndPaint(hWnd, &ps);
-}
-
/*******************************************************************************
* finish_splitbar [internal]
*
/*******************************************************************************
*
- * FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG)
+ * FUNCTION: ChildWnd_CmdWndProc(HWND, unsigned, WORD, LONG)
*
* PURPOSE: Processes WM_COMMAND messages for the main frame window.
*
*/
-static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+static BOOL ChildWnd_CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
HTREEITEM hSelection;
HKEY hRootKey;
/* TODO */
break;
case ID_TREE_EXPANDBRANCH:
- (void)TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_EXPAND);
+ TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_EXPAND);
break;
case ID_TREE_COLLAPSEBRANCH:
- (void)TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_COLLAPSE);
+ TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_COLLAPSE);
break;
case ID_TREE_RENAME:
SetFocus(g_pChildWnd->hTreeWnd);
- (void)TreeView_EditLabel(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd));
+ TreeView_EditLabel(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd));
break;
case ID_TREE_DELETE:
hSelection = TreeView_GetSelection(g_pChildWnd->hTreeWnd);
{
WNDPROC oldwndproc;
static WCHAR s_szNode[256];
- oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+ oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA);
switch (uMsg)
{
LPCWSTR keyPath, rootName;
LPWSTR fullPath;
+ /* Wipe the listview, the status bar and the address bar if the root key was selected */
+ if (TreeView_GetParent(g_pChildWnd->hTreeWnd, hItem) == NULL)
+ {
+ ListView_DeleteAllItems(g_pChildWnd->hListWnd);
+ SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)NULL);
+ SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)NULL);
+ return;
+ }
+
if (pszPath == NULL)
keyPath = GetItemPath(g_pChildWnd->hTreeWnd, hItem, &hRootKey);
else
* PURPOSE: Processes messages for the child windows.
*
* WM_COMMAND - process the application menu
- * WM_PAINT - Paint the main window
* WM_DESTROY - post a quit message and return
*
*/
LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
BOOL Result;
+ RECT rc;
switch (message)
{
WNDPROC oldproc;
HFONT hFont;
WCHAR buffer[MAX_PATH];
+ DWORD style;
/* Load "My Computer" string */
LoadStringW(hInst, IDS_MY_COMPUTER, buffer, COUNT_OF(buffer));
if (!g_pChildWnd) return 0;
wcsncpy(g_pChildWnd->szPath, buffer, MAX_PATH);
- g_pChildWnd->nSplitPos = 250;
+ g_pChildWnd->nSplitPos = 190;
g_pChildWnd->hWnd = hWnd;
- g_pChildWnd->hAddressBarWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP,
+
+ style = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
+ g_pChildWnd->hAddressBarWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, style,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
hWnd, (HMENU)0, hInst, 0);
- g_pChildWnd->hAddressBtnWnd = CreateWindowExW(0, L"Button", L"ยป", WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_TEXT | BS_CENTER | BS_VCENTER | BS_FLAT | BS_DEFPUSHBUTTON,
+
+ style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_ICON | BS_CENTER |
+ BS_VCENTER | BS_FLAT | BS_DEFPUSHBUTTON;
+ g_pChildWnd->hAddressBtnWnd = CreateWindowExW(0, L"Button", L"\x00BB", style,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
hWnd, (HMENU)0, hInst, 0);
+ g_pChildWnd->hArrowIcon = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_ARROW),
+ IMAGE_ICON, 12, 12, 0);
+ SendMessageW(g_pChildWnd->hAddressBtnWnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_pChildWnd->hArrowIcon);
+
+ GetClientRect(hWnd, &rc);
g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, (HMENU) TREE_WINDOW);
- g_pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, g_pChildWnd->szPath*/);
+ g_pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW, rc.right - g_pChildWnd->nSplitPos);
SetFocus(g_pChildWnd->hTreeWnd);
/* set the address bar and button font */
0);
}
/* Subclass the AddressBar */
- oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_WNDPROC);
+ oldproc = (WNDPROC)GetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_WNDPROC);
SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_USERDATA, (DWORD_PTR)oldproc);
SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_WNDPROC, (DWORD_PTR)AddressBarProc);
break;
PostMessageW(g_pChildWnd->hAddressBarWnd, WM_KEYUP, VK_RETURN, 0);
}
- if (!_CmdWndProc(hWnd, message, wParam, lParam))
+ if (!ChildWnd_CmdWndProc(hWnd, message, wParam, lParam))
{
goto def;
}
break;
- case WM_PAINT:
- OnPaint(hWnd);
- return 0;
case WM_SETCURSOR:
if (LOWORD(lParam) == HTCLIENT)
{
DestroyListView(g_pChildWnd->hListWnd);
DestroyTreeView(g_pChildWnd->hTreeWnd);
DestroyMainMenu();
+ DestroyIcon(g_pChildWnd->hArrowIcon);
HeapFree(GetProcessHeap(), 0, g_pChildWnd);
g_pChildWnd = NULL;
PostQuitMessage(0);
{
lResult = FALSE;
RegCloseKey(hKey);
- (void)TreeView_EditLabel(g_pChildWnd->hTreeWnd, ptvdi->item.hItem);
+ TreeView_EditLabel(g_pChildWnd->hTreeWnd, ptvdi->item.hItem);
}
else
{
hti.pt.x = pt.x;
hti.pt.y = pt.y;
ScreenToClient(g_pChildWnd->hTreeWnd, &hti.pt);
- (void)TreeView_HitTest(g_pChildWnd->hTreeWnd, &hti);
+ TreeView_HitTest(g_pChildWnd->hTreeWnd, &hti);
}
if (hti.flags & TVHT_ONITEM)
{
hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT);
- (void)TreeView_SelectItem(g_pChildWnd->hTreeWnd, hti.hItem);
+ TreeView_SelectItem(g_pChildWnd->hTreeWnd, hti.hItem);
memset(&item, 0, sizeof(item));
item.mask = TVIF_STATE | TVIF_CHILDREN;
item.hItem = hti.hItem;
- (void)TreeView_GetItem(g_pChildWnd->hTreeWnd, &item);
+ TreeView_GetItem(g_pChildWnd->hTreeWnd, &item);
/* Set the Expand/Collapse menu item appropriately */
LoadStringW(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, COUNT_OF(buffer));
projects / reactos.git / blobdiff