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

add handling for header elements in reflow. especially fixes alignment lossage.

Browse Source
This commit is contained in:
toshok%netscape.com 1998-09-22 22:51:43 +00:00
parent 41d8748274
commit 7dc2fbac6d
3 changed files with 97 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/lo_ele.h
View File

@ -1221,6 +1221,7 @@ typedef struct LO_Heading_struct {
Bool is_end;
int32 alignment;
Bool alignment_set;
} LO_HeadingStruct;
typedef struct LO_Span_struct {

15
lib/layout/layrelay.c
View File

@ -1554,8 +1554,19 @@ lo_rl_FitLayer( lo_RelayoutState *relay_state, LO_Element *lo_ele )
static LO_Element *
lo_rl_FitHeading( lo_RelayoutState *relay_state, LO_Element *lo_ele )
{
XP_ASSERT(0);
return lo_tv_GetNextLayoutElement( relay_state->doc_state, lo_ele, TRUE);
LO_Element *next = lo_tv_GetNextLayoutElement( relay_state->doc_state, lo_ele, TRUE);
LO_HeadingStruct *header = (LO_HeadingStruct*)lo_ele;
lo_DocState *state = relay_state->doc_state;
MWContext *context = relay_state->context;
/* Put the LO_HEADING element back on the line list */
header->lo_any.x = state->x;
header->lo_any.y = state->y;
header->lo_any.ele_id = NEXT_ELEMENT;
lo_AppendToLineList(context, state, lo_ele, 0);
lo_ProcessHeader(context, state, header, TRUE);
return next;
}
static LO_Element *

125
lib/layout/laytags.c
View File

@ -508,7 +508,7 @@ lo_ProcessParagraphElement(MWContext *context,
lo_AlignStack *aptr;
lo_SetLineBreakState(context, *state, LO_LINEFEED_BREAK_SOFT,
LO_CLEAR_NONE, 1, !in_relayout);
LO_CLEAR_NONE, 1, in_relayout);
aptr = lo_PopAlignment(*state);
if (aptr != NULL)
@ -620,70 +620,111 @@ lo_CloseParagraph(MWContext *context, lo_DocState **state, PA_Tag *tag, intn bla
}
}
void
lo_ProcessHeader(MWContext *context, lo_DocState *state,
LO_HeadingStruct *header, Bool in_relayout)
{
if (header->is_end)
{
Bool aligned_header;
if (state->align_stack
&& state->align_stack->type == P_HEADER_1)
aligned_header = TRUE;
if (aligned_header != FALSE)
{
lo_AlignStack *aptr;
lo_SetLineBreakState (context, state, LO_LINEFEED_BREAK_SOFT,
LO_CLEAR_NONE, 1, in_relayout);
aptr = lo_PopAlignment(state);
if (aptr != NULL)
{
XP_DELETE(aptr);
}
}
/*
* Now that we are on the line after the header, we
* don't want the next blank line to be the height of the probably
* large header, so reset it to the default here.
*/
state->line_height = state->default_line_height;
}
else
{
if (header->alignment_set)
lo_PushAlignment(state, P_HEADER_1, header->alignment);
}
}
static void
lo_OpenHeader(MWContext *context, lo_DocState *state, PA_Tag *tag)
{
PA_Block buff;
char *str;
LO_HeadingStruct* header;
header = (LO_HeadingStruct*)lo_NewElement(context, state, LO_HEADING, NULL, 0);
XP_ASSERT(header);
if (!header)
return;
header->lo_any.type = LO_HEADING;
header->lo_any.ele_id = NEXT_ELEMENT;
header->lo_any.x = state->x;
header->lo_any.y = state->y;
header->lo_any.x_offset = 0;
header->lo_any.y_offset = 0;
header->lo_any.width = 0;
header->lo_any.height = 0;
header->lo_any.line_height = 0;
header->is_end = FALSE;
header->alignment = LO_ALIGN_DEFAULT;
buff = lo_FetchParamValue(context, tag, PARAM_ALIGN);
if (buff != NULL)
{
int32 alignment;
PA_LOCK(str, char *, buff);
alignment = (int32)lo_EvalDivisionAlignParam(str);
header->alignment = (int32)lo_EvalDivisionAlignParam(str);
header->alignment_set = TRUE;
PA_UNLOCK(buff);
PA_FREE(buff);
lo_PushAlignment(state, tag->type, alignment);
}
lo_AppendToLineList(context, state, (LO_Element*)header, 0);
lo_ProcessHeader(context, state, header, FALSE);
}
static void
lo_CloseHeader(MWContext *context, lo_DocState *state)
{
Bool aligned_header;
LO_HeadingStruct* header;
/*
* Check the top of the alignment stack to see if we are closing
* a header that explicitly set an alignment.
*/
aligned_header = FALSE;
if (state->align_stack != NULL)
{
intn type;
header = (LO_HeadingStruct*)lo_NewElement(context, state, LO_HEADING, NULL, 0);
XP_ASSERT(header);
if (!header)
return;
type = state->align_stack->type;
if ((type == P_HEADER_1)||(type == P_HEADER_2)||
(type == P_HEADER_3)||(type == P_HEADER_4)||
(type == P_HEADER_5)||(type == P_HEADER_6))
{
aligned_header = TRUE;
}
}
header->lo_any.type = LO_HEADING;
header->lo_any.ele_id = NEXT_ELEMENT;
header->lo_any.x = state->x;
header->lo_any.y = state->y;
header->lo_any.x_offset = 0;
header->lo_any.y_offset = 0;
header->lo_any.width = 0;
header->lo_any.height = 0;
header->lo_any.line_height = 0;
header->is_end = TRUE;
header->alignment = LO_ALIGN_DEFAULT;
lo_SetLineBreakState ( context, state, FALSE, LO_LINEFEED_BREAK_HARD, 1, FALSE);
if (aligned_header != FALSE)
{
lo_AlignStack *aptr;
aptr = lo_PopAlignment(state);
if (aptr != NULL)
{
XP_DELETE(aptr);
}
}
/*
* Now that we are on the line after the header, we
* don't want the next blank line to be the height of the probably
* large header, so reset it to the default here.
*/
state->line_height = state->default_line_height;
lo_AppendToLineList(context, state, (LO_Element*)header, 0);
lo_ProcessHeader(context, state, header, FALSE);
}
static void