Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-02 23:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

move address bar into top rebar

Browse source 
svn path=/trunk/; revision=13334
This commit is contained in:
Martin Fuchs 2005-01-27 01:03:37 +00:00
parent a84129a69e
commit 46a940fddb
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/subsys/system/ibrowser/mainframe.cpp
View file

@ -124,7 +124,7 @@ MainFrameBase::MainFrameBase(HWND hwnd)
CheckMenuItem(_menu_info._hMenuView, ID_VIEW_SIDE_BAR, MF_BYCOMMAND|MF_UNCHECKED/*MF_CHECKED*/); CheckMenuItem(_menu_info._hMenuView, ID_VIEW_SIDE_BAR, MF_BYCOMMAND|MF_UNCHECKED/*MF_CHECKED*/);
// create rebar window to manage toolbar and drivebar // create rebar window to manage toolbar and address bar
#ifndef _NO_REBAR #ifndef _NO_REBAR
_hwndrebar = CreateWindowEx(WS_EX_TOOLWINDOW, REBARCLASSNAME, NULL, _hwndrebar = CreateWindowEx(WS_EX_TOOLWINDOW, REBARCLASSNAME, NULL,
WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN| WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN|
@ -149,10 +149,17 @@ MainFrameBase::MainFrameBase(HWND hwnd)
rbBand.cyMaxChild = 0; rbBand.cyMaxChild = 0;
rbBand.cyIntegral = btn_hgt; rbBand.cyIntegral = btn_hgt;
rbBand.lpText = NULL;//TEXT("Toolbar"); rbBand.lpText = TEXT("Toolbar");
rbBand.hwndChild = _htoolbar; rbBand.hwndChild = _htoolbar;
rbBand.cxMinChild = 0; rbBand.cxMinChild = 0;
rbBand.cyMinChild = btn_hgt + 4; rbBand.cyMinChild = btn_hgt + 4;
rbBand.cx = 182;
SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand);
rbBand.lpText = TEXT("Address");
rbBand.hwndChild = _haddressedit;
rbBand.cxMinChild = 0;
rbBand.cyMinChild = btn_hgt - 2;
rbBand.cx = 284; rbBand.cx = 284;
SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand);
#endif #endif
@ -395,13 +402,6 @@ void MainFrameBase::resize_frame(int cx, int cy)
rect.bottom -= rt.bottom; rect.bottom -= rt.bottom;
} }
if (IsWindowVisible(_haddressedit)) {
ClientRect rt(_haddressedit);
rect.bottom -= rt.bottom;
SetWindowPos(_haddressedit, 0, 0, rect.bottom, rect.right-rect.left, rt.bottom, SWP_NOACTIVATE|SWP_NOZORDER);
}
if (IsWindowVisible(_hsidebar)) { if (IsWindowVisible(_hsidebar)) {
WindowRect rt(_hsidebar); WindowRect rt(_hsidebar);
rect.left += rt.right-rt.left; rect.left += rt.right-rt.left;
@ -727,13 +727,6 @@ void MainFrame::resize_frame(int cx, int cy)
rect.bottom -= rt.bottom; rect.bottom -= rt.bottom;
} }
if (IsWindowVisible(_haddressedit)) {
ClientRect rt(_haddressedit);
rect.bottom -= rt.bottom;
SetWindowPos(_haddressedit, 0, 0, rect.bottom, rect.right-rect.left, rt.bottom, SWP_NOACTIVATE|SWP_NOZORDER);
}
if (IsWindowVisible(_hsidebar)) { if (IsWindowVisible(_hsidebar)) {
WindowRect rt(_hsidebar); WindowRect rt(_hsidebar);
rect.left += rt.right-rt.left; rect.left += rt.right-rt.left;