Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 12:32:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fix for the separator in personal toolbar crash. Reviewed by Daniel

Browse Source 
Matejka and Garrett Blythe.  Approved by Don Melton.
This commit is contained in:
hyatt 1998-03-30 23:30:00 +00:00
parent cbcd23f1de
commit 0cf1a6c8bc
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/winfe/usertlbr.cpp
View File

@ -989,8 +989,8 @@ void CLinkToolbar::SetMinimumRows(int rowWidth)
{
// Get the current button
CLinkToolbarButton* pButton = (CLinkToolbarButton*)(HT_GetNodeFEData(item));
if (!pButton)
return;
if (!pButton) // Separator
continue;
CSize s = pButton->GetMinimalButtonSize();
int tempTotal = totalLine + s.cx;
@ -1090,8 +1090,8 @@ void CLinkToolbar::LayoutButtons(int nIndex)
{
// Get the current button
CLinkToolbarButton* pButton = (CLinkToolbarButton*)(HT_GetNodeFEData(item));
if (!pButton)
return;
if (!pButton)
continue;
if (numChars == 0)
{
@ -1117,7 +1117,9 @@ void CLinkToolbar::LayoutButtons(int nIndex)
{
// Get the current button
CLinkToolbarButton* pButton = (CLinkToolbarButton*)(HT_GetNodeFEData(item));
if (!pButton) // Separator
continue;
// See how much this num chars takes up
ComputeLayoutInfo(pButton, numChars, rowWidth, usedSpace);
}
@ -1141,7 +1143,9 @@ void CLinkToolbar::LayoutButtons(int nIndex)
{
// Get the current button
CLinkToolbarButton* pButton = (CLinkToolbarButton*)(HT_GetNodeFEData(item));
if (!pButton) // Separator
continue;
buttonSize = pButton->GetButtonSize(); // The size we must be
int tempTotal = nStartX + buttonSize.cx;
@ -1204,7 +1208,9 @@ void CLinkToolbar::WidthChanged(int animWidth)
{
// Get the current button
CLinkToolbarButton* pButton = (CLinkToolbarButton*)(HT_GetNodeFEData(item));
if (!pButton) // Separator
continue;
if (numChars == 0)
{
numChars = pButton->GetMaxTextCharacters();
@ -1229,7 +1235,9 @@ void CLinkToolbar::WidthChanged(int animWidth)
{
// Get the current button
CLinkToolbarButton* pButton = (CLinkToolbarButton*)(HT_GetNodeFEData(item));
if (!pButton)
continue;
// See how much this num chars takes up
ComputeLayoutInfo(pButton, numChars, rowWidth, usedSpace);
}
@ -1254,7 +1262,9 @@ void CLinkToolbar::WidthChanged(int animWidth)
{
// Get the current button
CLinkToolbarButton* pButton = (CLinkToolbarButton*)(HT_GetNodeFEData(item));
if (!pButton)
continue;
buttonSize = pButton->GetButtonSize(); // The size we must be
int tempTotal = nStartX + buttonSize.cx;