Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added more support to change list to blockquote

Browse Source
This commit is contained in:
cmanske%netscape.com 1998-09-30 20:30:51 +00:00
parent 3e8c2f4e1d
commit d143054f6f
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/layout/editor.cpp
View File

@ -1462,7 +1462,7 @@ XP_Bool EDT_GetToggleListState(MWContext *pContext, intn iTagType)
// Description list is a special case - it doesn't (and shouldn't)
// have <LI> items. It should contain <DT> (Desc.Title) and
// <DD> (Desc. text) items.
if ( nParagraphFormat == P_LIST_ITEM || iTagType == P_DESC_LIST ) {
if ( nParagraphFormat == P_LIST_ITEM || iTagType == P_DESC_LIST || iTagType == P_BLOCKQUOTE ) {
pData = EDT_GetListData(pContext);
bIsMyList = ( pData && pData->iTagType == iTagType );
}

58
lib/layout/edtbuf.cpp
View File

@ -4405,7 +4405,6 @@ void CEditBuffer::MorphListContainer( TagType t )
void CEditBuffer::MorphListContainer2( TagType t, CEditSelection& /*selection*/ )
{
//TODO: HANDLE LISTS IN SELECTION
EDT_ListData * pListData = GetListData();
if( !pListData ){
// We don't have container -- start one
@ -4444,60 +4443,77 @@ void CEditBuffer::ToggleList(intn iTagType)
EndBatchChanges();
}
} else {
GetSelection(selection);
ToggleList2(iTagType, selection);
}
}
// TODO: HANDLE SELECTION -- SEE MorphContainerSelection
// This doesn't seem to pay attention to selection - probably source of some bugs
void CEditBuffer::ToggleList2(intn iTagType, CEditSelection& /*selection*/)
{
EDT_ListData * pData = NULL;
EDT_ListData * pListData = NULL;
TagType nParagraphFormat = GetParagraphFormatting();
XP_Bool bIsMyList = FALSE;
XP_Bool bIsDescList = FALSE;
if ( nParagraphFormat == P_LIST_ITEM || iTagType == P_DESC_LIST )
if ( nParagraphFormat == P_LIST_ITEM || iTagType == P_DESC_LIST || iTagType == P_BLOCKQUOTE )
{
pData = GetListData();
bIsMyList = ( pData && pData->iTagType == iTagType );
pListData = GetListData();
bIsMyList = ( pListData && pListData->iTagType == iTagType );
}
bIsDescList = bIsMyList && (iTagType == P_DESC_LIST);
if ( (nParagraphFormat == P_LIST_ITEM || bIsDescList)
&& bIsMyList )
if ( bIsMyList &&
(nParagraphFormat == P_LIST_ITEM ||
iTagType == P_DESC_LIST) )
{
// This will remove any list container
MorphContainer(P_NSDT);
}
else if( bIsMyList && iTagType == P_BLOCKQUOTE )
{
// Remove all indent levels
if( m_pCurrent )
{
CEditContainerElement *pContainer;
CEditListElement *pList;
m_pCurrent->FindList(pContainer, pList);
TerminateList(pContainer);
Relayout( pContainer, 0, pContainer );
}
}
else
{
if ( !pData )
if ( !pListData )
{
// Create a numbered list item ONLY if not Description list
if( iTagType == P_BLOCKQUOTE )
{
Indent();
}
// Create a numbered list item ONLY if not Description list or BlockQuote
// (This will automatically indent, i.e., create the list container)
if (nParagraphFormat != P_LIST_ITEM && iTagType != P_DESC_LIST) {
else if (nParagraphFormat != P_LIST_ITEM && iTagType != P_DESC_LIST )
{
MorphContainer(P_LIST_ITEM);
}
pData = GetListData();
pListData = GetListData();
}
else if (nParagraphFormat == P_LIST_ITEM && iTagType == P_DESC_LIST )
{
// We are converting an existing list item into
// a description, so remove the list item
MorphContainer(P_DESC_TITLE);
pData = GetListData();
pListData = GetListData();
}
if ( pData && (pData->iTagType != iTagType) )
if ( pListData && (pListData->iTagType != iTagType) )
{
pData->iTagType = iTagType;
pData->eType = ED_LIST_TYPE_DEFAULT;
SetListData(pData);
pListData->iTagType = iTagType;
pListData->eType = ED_LIST_TYPE_DEFAULT;
SetListData(pListData);
}
}
if ( pData )
EDT_FreeListData(pData);
if ( pListData )
EDT_FreeListData(pListData);
}
void CEditBuffer::SetParagraphAlign( ED_Alignment eAlign ){