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

Fixed bugs 174178, 188530, 299735. Implemented new drag cell and table behavior

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@6224 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cmanske%netscape.com 1998-07-23 04:18:49 +00:00
parent 170d9ecd11
commit 8ac0270738
5 changed files with 90 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
mozilla/lib/layout/edtbuf.cpp
View File

@ -6559,12 +6559,18 @@ void CEditBuffer::MergeTableCells()
// We are merging all selected cells
for( int i = 1; i < iCount; i++ )
{
// The "next" editor cell is always at index 1 because
// we delete each "cell 1" and unselect it
// (i.e., delete pointer from m_SelectedEdCells) as we merge.
// Note that corresponding LO_CellStruct was NOT deleted,
// but its pointer is deleted from m_pSelectedLoCells list.
CEditTableCellElement *pNextCell = m_SelectedEdCells[1];
// We must add all COLSPANs of all cells to be merged
pNextCellData = m_SelectedEdCells[i]->GetData();
pNextCellData = pNextCell->GetData();
if( pNextCellData )
{
// If y value is same, next cell is in same row, so do ColSpan
if( y == m_SelectedLoCells[i]->y )
if( y == m_SelectedLoCells[1]->y )
{
pFirstCellData->iColSpan += pNextCellData->iColSpan;
}
@ -6572,13 +6578,14 @@ void CEditBuffer::MergeTableCells()
// If x value is same, next cell is in same col, so do RowSpan
// Note: This will work for strange selection sets, but if all
// cells in largest bounding rect aren't selected, we can get some strange results!
if( x == m_SelectedLoCells[i]->x )
if( x == m_SelectedLoCells[1]->x )
{
pFirstCellData->iRowSpan += pNextCellData->iRowSpan;
}
EDT_FreeTableCellData(pNextCellData);
}
pFirstCell->MergeCells(m_SelectedEdCells[i]);
// Move all contents of Next cell into First cell and delete Next cell
pFirstCell->MergeCells(pNextCell);
}
} else {
// We are merging with just the next cell to the right
@ -6591,7 +6598,7 @@ void CEditBuffer::MergeTableCells()
}
pFirstCell->MergeCells( pNextCell );
}
// Set the SPAN data for the merged cell
// Set the COLSPAN and ROWSPAN data for the merged cell
pFirstCell->SetData(pFirstCellData);
EDT_FreeTableCellData(pFirstCellData);
@ -6600,7 +6607,7 @@ void CEditBuffer::MergeTableCells()
// (else we crash in Relayout)
SetTableInsertPoint(pFirstCell);
ClearTableAndCellSelection();
// Note: Only pFirstCell should now be selected
// Relayout the entire table
Relayout(pFirstCell->GetParentTable(), 0);
@ -10098,25 +10105,25 @@ void CEditBuffer::FinishedLoad2()
XP_Bool bIsNewDocument = EDT_IS_NEW_DOCUMENT(m_pContext)
&& !GetCommandLog()->InReload();
if( bIsNewDocument ){
if( bIsNewDocument )
{
m_bDummyCharacterAddedDuringLoad = TRUE; /* Sometimes it's a no-break space. */
// This will call EDT_SetPageData(),
// which calls RefreshLayout()
FE_SetNewDocumentProperties(m_pContext);
m_bDummyCharacterAddedDuringLoad = TRUE; /* Sometimes it's a no-break space. */
// Get rid of extra characters.
}
RefreshLayout();
else
RefreshLayout();
// Add GENERATOR meta-data. This tells us who most recently edited the doucment.
{
char generatorValue[300];
XP_SPRINTF(generatorValue, "%.90s/%.100s [%.100s]", XP_AppCodeName, XP_AppVersion, XP_AppName);
char generatorValue[300];
XP_SPRINTF(generatorValue, "%.90s/%.100s [%.100s]", XP_AppCodeName, XP_AppVersion, XP_AppName);
EDT_MetaData *pData = MakeMetaData( FALSE, "GENERATOR", generatorValue);
EDT_MetaData *pData = MakeMetaData( FALSE, "GENERATOR", generatorValue);
SetMetaData( pData );
FreeMetaData( pData );
}
SetMetaData( pData );
FreeMetaData( pData );
SetSelectionInNewDocument();
@ -10985,7 +10992,7 @@ void CEditBuffer::StartSelection( int32 x, int32 y, XP_Bool doubleClick ){
// Remove any existing table or cell selection
// This is the best place to put this so all "normal" selection-setting
// clears the table selection, but it prevents moving caret without clearing table
ClearTableAndCellSelection();
// ClearTableAndCellSelection();
FE_DestroyCaret(m_pContext);
ClearMove(); // do this when moving caret and not up or down arrow
@ -11181,8 +11188,10 @@ void CEditBuffer::ExtendSelection( int32 x, int32 y ){
m_iCurrentOffset = 0;
// We really did extend selection -
// Remove any existing table or cell selection
ClearTableAndCellSelection();
// ClearTableAndCellSelection();
}
// Always clear table and cell selection
ClearTableAndCellSelection();
}
void CEditBuffer::ExtendSelectionElement( CEditLeafElement *pEle, int iOffset, XP_Bool bStickyAfter ){
@ -11380,6 +11389,10 @@ void CEditBuffer::EndSelection(int32 /* x */, int32 /* y */){
void CEditBuffer::EndSelection( )
{
// Always clear any table and cell selection
// (We don't do this on mouse down now)
ClearTableAndCellSelection();
// Clear the move just in case EndSelection is called out of order
// (this seems to be happening in the WinFE when you click a lot.)
// ClearMove has a side-effect of flushing the relayout timer.
@ -12679,7 +12692,6 @@ EDT_ClipboardResult CEditBuffer::PasteHTML( IStreamIn& stream, XP_Bool /* bUndoR
if ( pFirstInserted )
{
CEditElement* pLast = pLastInserted->GetLastMostChild()->NextLeafAll();
// Get the children early, because if we paste a single container,
// it will be deleted when we merge the left edge
CEditLeafElement* pFirstMostNewChild = pFirstInserted->GetFirstMostChild()->Leaf();
@ -12736,11 +12748,16 @@ EDT_ClipboardResult CEditBuffer::PasteHTML( IStreamIn& stream, XP_Bool /* bUndoR
#endif
m_bNoRelayout = FALSE;
//FixupSpace( );
//Fix for bug 174178. This used to be obtained before FinishedLoad,
// but when inserting before a single space in a table cell,
// that space is deleted during FinishedLoad.
CEditElement* pNextLeaf = pLastInserted->GetLastMostChild()->NextLeafAll();
// We need to reduce before we relayout because otherwise
// null insert points mess up the setting of end-of-paragraph
// marks.
CEditInsertPoint tmp(pLast,0);
CEditInsertPoint tmp(pNextLeaf,0);
CPersistentEditInsertPoint end2 = EphemeralToPersistent(tmp);
Reduce( m_pRoot );
CEditInsertPoint end3 = PersistentToEphemeral(end2);
@ -14051,13 +14068,9 @@ ED_HitType CEditBuffer::GetTableHitRegion(int32 x, int32 y, LO_Element **ppEleme
// Now check where in Table and Cell the cursor is over
if (pTableElement)
{
XP_Bool bCanDragTable = (!bModifierKeyPressed && (pTableElement->lo_table.ele_attrmask & LO_ELE_SELECTED));
// First check for cell hit regions
if(pCellElement)
{
XP_Bool bCanDragCells = (!bModifierKeyPressed && (pCellElement->lo_cell.ele_attrmask & LO_ELE_SELECTED));
// Return the cell found, even if result is ED_HIT_NONE
if(ppElement) *ppElement = pCellElement;
@ -14069,11 +14082,6 @@ ED_HitType CEditBuffer::GetTableHitRegion(int32 x, int32 y, LO_Element **ppEleme
if( x >= right_limit || // Anywhere in inter-cell space to the right of the cell
(y >= top_limit && y <= bottom_limit) ) // Inside cell, near right edge, excluding corners
{
// If a selected cell - drag selection,
// except if modifier key is pressed for sizing
if( bCanDragCells )
return ED_HIT_DRAG_TABLE;
// Modifier key pressed an near right edge, excluding corners
return ED_HIT_SIZE_COL;
}
@ -14104,12 +14112,6 @@ ED_HitType CEditBuffer::GetTableHitRegion(int32 x, int32 y, LO_Element **ppEleme
if( x <= right_limit )
{
// Near top border of cell, excluding corners
// If a selected cell - drag selection,
// except if modifier key is pressed for sizing
if( bCanDragCells )
return ED_HIT_DRAG_TABLE;
return ED_HIT_SEL_CELL;
}
// Upper right corner - leave for sizing image flush against borders
@ -14118,21 +14120,24 @@ ED_HitType CEditBuffer::GetTableHitRegion(int32 x, int32 y, LO_Element **ppEleme
if( y >= bottom_limit ) // Along bottom edge (including intercell region)
{
// If a selected cell - drag selection,
// except if modifier key is pressed for sizing
if( bCanDragCells )
return ED_HIT_DRAG_TABLE;
// Size the row
return ED_HIT_SIZE_ROW;
}
// Inside of a cell and no hit regions
// Inside of a cell
// Can drag the cell or table if inside a selected cell
if( (pCellElement->lo_cell.ele_attrmask & LO_ELE_SELECTED) ||
(pTableElement->lo_table.ele_attrmask & LO_ELE_SELECTED) )
{
return ED_HIT_DRAG_TABLE;
}
return ED_HIT_NONE;
}
// Return the table element
// No cell selected - return the table element
if( ppElement) *ppElement = pTableElement;
// Set test limits for Table element
@ -14144,12 +14149,6 @@ ED_HitType CEditBuffer::GetTableHitRegion(int32 x, int32 y, LO_Element **ppEleme
if( y <= top_limit )
{
// Upper left corner
// If a selected table - drag selection,
// except if modifier key is pressed for sizing
if( bCanDragTable )
return ED_HIT_DRAG_TABLE;
if( bModifierKeyPressed )
return ED_HIT_SEL_ALL_CELLS;
@ -14172,32 +14171,17 @@ ED_HitType CEditBuffer::GetTableHitRegion(int32 x, int32 y, LO_Element **ppEleme
// Lower right corner
return ED_HIT_ADD_COLS;
// If a selected table - drag selection,
// except if modifier key is pressed for sizing
if( bCanDragTable )
return ED_HIT_DRAG_TABLE;
// Along right edge
return ED_HIT_SIZE_TABLE_WIDTH;
}
else if( y >= bottom_limit )
{
// If a selected table - drag selection,
// except if modifier key is pressed for sizing
if( bCanDragTable )
return ED_HIT_DRAG_TABLE;
// Below bottom, excluding corners
return ED_HIT_SIZE_TABLE_HEIGHT;
}
if( y <= top_limit )
{
// If a selected table - drag selection,
// except if modifier key is pressed for sizing
if( bCanDragTable )
return ED_HIT_DRAG_TABLE;
// Along top border - select column
if( ppElement)
{
@ -14205,7 +14189,11 @@ ED_HitType CEditBuffer::GetTableHitRegion(int32 x, int32 y, LO_Element **ppEleme
}
return ED_HIT_SEL_COL;
}
// Inside a cell in a selected table
if( pTableElement->lo_table.ele_attrmask & LO_ELE_SELECTED )
return ED_HIT_DRAG_TABLE;
}
return ED_HIT_NONE;
}

6
mozilla/lib/layout/edtele.cpp
View File

@ -5613,6 +5613,12 @@ void CEditTableCellElement::MergeCells(CEditTableCellElement* pCell)
if( !pCell || pCell == this )
return;
// Be sure cell is not selected
// We do this in cell's destructor when we delete it below,
// but its contents will be moved so the wrong LO_CellStruct will
// be found if we don't do this now.
GetEditBuffer()->SelectCell(FALSE, NULL, pCell);
// Don't merge cells with only single, empty string as only element
// Just delete the cell to be merged
if( !pCell->IsEmpty() )

4
mozilla/lib/layout/edtutil.cpp
View File

@ -4827,7 +4827,7 @@ XP_Bool CSizingObject::GetSizingRect(int32 xVal, int32 yVal, XP_Bool bLockAspect
} else if( m_iStyle == ED_SIZE_ADD_COLS )
{
int iAddCols = iNewWidth / EDT_NEW_COL_WIDTH;
PR_snprintf(pMsg, 128, XP_GetString(XP_EDT_ADD_COLUMNS), iAddCols);
PR_snprintf(pMsg, 128, XP_GetString(XP_EDT_ADD_COLUMNS_STATUS), iAddCols);
XP_Rect rect;
// Erase all existing lines
@ -4850,7 +4850,7 @@ XP_Bool CSizingObject::GetSizingRect(int32 xVal, int32 yVal, XP_Bool bLockAspect
} else if( m_iStyle == ED_SIZE_ADD_ROWS )
{
int iAddRows = iNewHeight / EDT_NEW_ROW_HEIGHT;
PR_snprintf(pMsg, 128, XP_GetString(XP_EDT_ADD_ROWS), iAddRows);
PR_snprintf(pMsg, 128, XP_GetString(XP_EDT_ADD_ROWS_STATUS), iAddRows);
XP_Rect rect;
// Erase all existing lines

24
mozilla/lib/layout/laysel.c
View File

@ -4852,6 +4852,30 @@ Bool LO_Click(MWContext *context, int32 x, int32 y, Bool requireCaret,
layer);
}
/* Similar to lo_Click, but doesn't process click
Returns TRUE if line would be selected if user clicked here
We only use this in Editor, so we can assume "layer" is NULL
*/
Bool LO_CanSelectLine(MWContext *context, int32 x, int32 y)
{
int32 doc_id;
lo_TopState *top_state;
lo_DocState *state;
LO_HitResult result;
doc_id = XP_DOCID(context);
top_state = lo_FetchTopState(doc_id);
if ((top_state == NULL)||(top_state->doc_state == NULL))
{
return FALSE;
}
state = top_state->doc_state;
LO_Hit(context, x, y, FALSE, &result, NULL);
return (result.lo_hitLine.region == LO_HIT_LINE_REGION_BEFORE);
}
Bool lo_ProcessClick(MWContext *context, lo_TopState *top_state, lo_DocState *state, LO_HitResult* result, Bool requireCaret, CL_Layer *layer)
{
switch ( result->type )

9
mozilla/lib/layout/layutil.c
View File

@ -3564,12 +3564,15 @@ XP_Bool lo_AllCellsSelectedInColumnOrRow( LO_CellStruct *pCell, XP_Bool bInColum
(!bInColumn && pCell->y == tptr->lo_any.y) )
{
/* If any cell is not selected, return FALSE */
if( !(pCell->ele_attrmask & LO_ELE_SELECTED) )
if( !(tptr->lo_cell.ele_attrmask & LO_ELE_SELECTED) )
return FALSE;
}
}
tptr = tptr->lo_any.next;
} while (tptr != pLastCell);
/* Edge case of only 1 cell in row/col */
if( tptr != pLastCell )
tptr = tptr->lo_any.next;
} while (tptr && tptr != pLastCell);
return TRUE;
}