Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix enabling of split border

Browse source 
svn path=/trunk/; revision=18210
This commit is contained in:
Martin Fuchs 2005-10-02 12:24:10 +00:00
parent 63935e005c
commit 6a834bb1fb
1 changed files with 40 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/subsys/system/explorer/shell/mainframe.cpp
View file

@ -93,6 +93,7 @@ int MainFrameBase::OpenShellFolders(LPIDA pida, HWND hFrameWnd)
LPCITEMIDLIST parent_pidl = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[0]); LPCITEMIDLIST parent_pidl = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[0]);
ShellFolder folder(parent_pidl); ShellFolder folder(parent_pidl);
LOG(FmtString(TEXT("MainFrameBase::OpenShellFolders(): parent_pidl=%s"), (LPCTSTR)FileSysShellPath(parent_pidl)));
for(int i=pida->cidl; i>0; --i) { for(int i=pida->cidl; i>0; --i) {
LPCITEMIDLIST pidl = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[i]); LPCITEMIDLIST pidl = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[i]);
@ -109,6 +110,7 @@ int MainFrameBase::OpenShellFolders(LPIDA pida, HWND hFrameWnd)
bool separateFolders = XMLBool(explorer_options, "separate-folders", true); bool separateFolders = XMLBool(explorer_options, "separate-folders", true);
ShellPath pidl_abs = ShellPath(pidl).create_absolute_pidl(parent_pidl); ShellPath pidl_abs = ShellPath(pidl).create_absolute_pidl(parent_pidl);
LOG(FmtString(TEXT("MainFrameBase::OpenShellFolders(): pidl_abs=%s"), (LPCTSTR)FileSysShellPath(pidl_abs)));
if (hFrameWnd && (mdi || !separateFolders)) { if (hFrameWnd && (mdi || !separateFolders)) {
int flags = OWM_PIDL; int flags = OWM_PIDL;
@ -922,7 +924,7 @@ LRESULT MDIMainFrame::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
path = fsp; path = fsp;
if (path) { if (path) {
LOG(FmtString(TEXT("PM_OPEN_WINDOW: path=%s"), path)); LOG(FmtString(TEXT("MDIMainFrame PM_OPEN_WINDOW: path=%s"), path));
lstrcpy(buffer, path); lstrcpy(buffer, path);
path = buffer; path = buffer;
} }
@ -1354,6 +1356,8 @@ LRESULT SDIMainFrame::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
case WM_PAINT: { case WM_PAINT: {
PaintCanvas canvas(_hwnd); PaintCanvas canvas(_hwnd);
if (_left_hwnd) {
ClientRect rt(_hwnd); ClientRect rt(_hwnd);
rt.left = _split_pos-SPLIT_WIDTH/2; rt.left = _split_pos-SPLIT_WIDTH/2;
rt.right = _split_pos+SPLIT_WIDTH/2+1; rt.right = _split_pos+SPLIT_WIDTH/2+1;
@ -1368,9 +1372,11 @@ LRESULT SDIMainFrame::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
HBRUSH lastBrush = SelectBrush(canvas, GetStockBrush(COLOR_SPLITBAR)); HBRUSH lastBrush = SelectBrush(canvas, GetStockBrush(COLOR_SPLITBAR));
Rectangle(canvas, rt.left, rt.top-1, rt.right, rt.bottom+1); Rectangle(canvas, rt.left, rt.top-1, rt.right, rt.bottom+1);
SelectObject(canvas, lastBrush); SelectObject(canvas, lastBrush);
}
break;} break;}
case WM_SETCURSOR: case WM_SETCURSOR:
if (_left_hwnd)
if (LOWORD(lparam) == HTCLIENT) { if (LOWORD(lparam) == HTCLIENT) {
POINT pt; POINT pt;
GetCursorPos(&pt); GetCursorPos(&pt);
@ -1383,7 +1389,8 @@ LRESULT SDIMainFrame::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
} }
goto def; goto def;
case WM_LBUTTONDOWN: { case WM_LBUTTONDOWN:
if (_left_hwnd) {
int x = GET_X_LPARAM(lparam); int x = GET_X_LPARAM(lparam);
ClientRect rt(_hwnd); ClientRect rt(_hwnd);
@ -1392,8 +1399,8 @@ LRESULT SDIMainFrame::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
_last_split = _split_pos; _last_split = _split_pos;
SetCapture(_hwnd); SetCapture(_hwnd);
} }
}
break;} break;
case WM_LBUTTONUP: case WM_LBUTTONUP:
if (GetCapture() == _hwnd) if (GetCapture() == _hwnd)
@ -1445,7 +1452,7 @@ LRESULT SDIMainFrame::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
path = fsp; path = fsp;
if (path) { if (path) {
LOG(FmtString(TEXT("PM_OPEN_WINDOW: path=%s"), path)); LOG(FmtString(TEXT("SDIMainFrame PM_OPEN_WINDOW: path=%s"), path));
lstrcpy(buffer, path); lstrcpy(buffer, path);
path = buffer; path = buffer;
} }
@ -1548,7 +1555,7 @@ void SDIMainFrame::resize_children()
hdwp = DeferWindowPos(hdwp, _left_hwnd, 0, _clnt_rect.left, _clnt_rect.top, _split_pos-SPLIT_WIDTH/2-_clnt_rect.left, _clnt_rect.bottom-_clnt_rect.top, SWP_NOZORDER|SWP_NOACTIVATE); hdwp = DeferWindowPos(hdwp, _left_hwnd, 0, _clnt_rect.left, _clnt_rect.top, _split_pos-SPLIT_WIDTH/2-_clnt_rect.left, _clnt_rect.bottom-_clnt_rect.top, SWP_NOZORDER|SWP_NOACTIVATE);
} else { } else {
//_split_pos = 0; //_split_pos = -1;
cx = 0; cx = 0;
} }
@ -1661,7 +1668,7 @@ void SDIMainFrame::jump_to(LPCTSTR path, int mode)
} else */{ } else */{
_shellpath_info._open_mode = mode; _shellpath_info._open_mode = mode;
_shellpath_info._shell_path = path; _shellpath_info._shell_path = path;
_shellpath_info._root_shell_path = SpecialFolderPath(CSIDL_DRIVES, _hwnd); //@@ _shellpath_info._root_shell_path = SpecialFolderPath(CSIDL_DRIVES, _hwnd); //@@ path
update_shell_browser(); update_shell_browser();
} }
@ -1678,7 +1685,7 @@ void SDIMainFrame::jump_to(LPCITEMIDLIST path, int mode)
} else { } else {
_shellpath_info._open_mode = mode; _shellpath_info._open_mode = mode;
_shellpath_info._shell_path = path; _shellpath_info._shell_path = path;
_shellpath_info._root_shell_path = SpecialFolderPath(CSIDL_DRIVES, _hwnd); //@@ _shellpath_info._root_shell_path = path; //@@ MF 02.10.2005 was: SpecialFolderPath(CSIDL_DRIVES, _hwnd);
update_shell_browser(); update_shell_browser();
} }