Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes and improvements to NavCenter.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@9657 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com 1998-09-09 20:26:33 +00:00
parent bb7136efe1
commit b06ce42e18
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/cmd/winfe/navbar.cpp
View File

@ -353,7 +353,7 @@ void CNavTitleBar::OnLButtonDown (UINT nFlags, CPoint point )
else if (cachedModeRect.PtInRect(point))
{
CRDFOutliner* pOutliner = (CRDFOutliner*)HT_GetViewFEData(m_View);
HT_ToggleTreeMode(m_View);
//HT_ToggleTreeMode(m_View);
}
else if (cachedAddRect.PtInRect(point))
{

17
mozilla/cmd/winfe/navfram.cpp
View File

@ -280,9 +280,11 @@ CNSNavFrame* CNSNavFrame::CreateFramedRDFViewFromResource(CWnd* pParent, int xPo
CRDFOutliner* pOutliner = (CRDFOutliner*)(pNavFrame->GetContentView()->GetOutlinerParent()->GetOutliner());
// Display in the appropriate spot depending on our tree state (docked, standalone, or popup)
CString treeState = HT_GetTreeStateForButton(node);
if (treeState == "Popup" || treeState == "popup")
int treeState = HT_GetTreeStateForButton(node);
if (treeState == HT_POPUP_WINDOW)
{
HT_SetWindowType(pNavFrame->GetHTPane(), HT_POPUP_WINDOW);
// Actually appear at the specified position and set the popup flag to be true.
pNavFrame->SetDockStyle(DOCKSTYLE_POPUP);
@ -291,8 +293,10 @@ CNSNavFrame* CNSNavFrame::CreateFramedRDFViewFromResource(CWnd* pParent, int xPo
pOutliner->SetIsPopup(TRUE);
}
else if (treeState == "Docked" || treeState == "docked")
else if (treeState == HT_DOCKED_WINDOW)
{
HT_SetWindowType(pNavFrame->GetHTPane(), HT_DOCKED_WINDOW);
// We're supposed to come up docked to the window. Call DockFrame after setting
// the correct dock style
pNavFrame->SetDockStyle(DOCKSTYLE_DOCKEDLEFT);
@ -489,6 +493,10 @@ void CNSNavFrame::CalcClientArea(RECT* lpRectClient, CNSGenFrame * pParentFrame)
//------------------------------------------------------------------------------
void CNSNavFrame::ForceFloat(BOOL show)
{
// Notify HT of our new state. Reset to the popup state.
HT_SetTreeStateForButton(HT_TopNode(HT_GetSelectedView(GetHTPane())), HT_POPUP_WINDOW);
HT_SetWindowType(GetHTPane(), HT_STANDALONE_WINDOW);
CFrameWnd *pLayout = GetParentFrame();
nsModifyStyle( GetSafeHwnd(), GWL_STYLE, WS_CHILD, WS_OVERLAPPEDWINDOW);
@ -559,7 +567,8 @@ void CNSNavFrame::DockFrame(CNSGenFrame* pParent, short dockStyle)
}
// Notify HT of our new state.
HT_SetTreeStateForButton(HT_TopNode(HT_GetSelectedView(GetHTPane())), "Docked");
HT_SetTreeStateForButton(HT_TopNode(HT_GetSelectedView(GetHTPane())), HT_DOCKED_WINDOW);
HT_SetWindowType(GetHTPane(), HT_DOCKED_WINDOW);
CRect rect = m_dockingDragRect;

3
mozilla/cmd/winfe/usertlbr.cpp
View File

@ -1454,7 +1454,8 @@ void CRDFToolbar::HandleEvent(HT_Notification ns, HT_Resource n, HT_Event whatHa
CRDFToolbarButton* pButton = (CRDFToolbarButton*)HT_GetNodeFEData(n);
pButton->AddTextEdit();
}
else if (whatHappened == HT_EVENT_NODE_VPROP_CHANGED)
else if (whatHappened == HT_EVENT_NODE_VPROP_CHANGED &&
HT_GetParent(n) == HT_TopNode(HT_GetView(n)))
{
CRDFToolbarButton* pButton = (CRDFToolbarButton*)HT_GetNodeFEData(n);
if (pButton->m_hWnd)