mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 04:26:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change handling of form element widths / heights.

Browse Source 
svn path=/trunk/netsurf/; revision=4107
This commit is contained in:
Michael Drake 2008-04-25 14:15:18 +00:00
parent fc4e39f5b8
commit 4110152a62
2 changed files with 62 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
!NetSurf/Resources/CSS,f79
View File

@ -145,18 +145,16 @@ iframe[align=right] { float: right; }
form { display: block; }
input, button { background-color: #fff; color: #000; text-align: left;
font-family: sans-serif; width: 10em; height: auto; overflow: hidden;
font-family: sans-serif; width: auto; height: auto; overflow: hidden;
margin: 1px; border: 2px solid #333; padding: 1px 2px; }
input[type=button], input[type=reset], input[type=submit], button {
background-color: #d9d9d9; color: #000; text-align: center;
width: auto; height: auto;
border: medium outset #d9d9d9; padding: 1px 0.5em; }
input[type=image] { background-color: transparent; color: #000;
width: auto; height: auto; border: none; padding: 0 2px; }
border: none; padding: 0 2px; }
input[type=checkbox], input[type=radio] { background-color: transparent;
width: 1em; height: 1em; border: none; padding: 0 0.1em; }
input[type=file] { background-color: #d9d9d9; color: #000;
width: 10em; height: 1.5em; font-style: italic;
border: none; padding: 0 0.1em; }
input[type=file] { background-color: #d9d9d9; color: #000; font-style: italic;
border: medium inset #d9d9d9; padding: 1px 2px;}
input[align=left] { float: left; }
input[align=right] { float: right; }
@ -168,7 +166,7 @@ select { background-color: #d9d9d9; color: #000; text-align: left;
select:after { content: "\25bc"; border-left: 4px ridge #d9d9d9; }
textarea { background-color: #fff; color: #000; text-align: left;
font-family: monospace; width: 10em; height: 4em; overflow: scroll;
font-family: monospace; width: auto; height: auto; overflow: scroll;
margin: 1px; border: 2px solid #333; padding: 0 2px; }
fieldset { display: block; border: thin solid #888; margin: 1.12em 0; }

69
render/layout.c
View File

@ -487,6 +487,9 @@ void layout_minmax_block(struct box *block)
int min = 0, max = 0;
int extra_fixed = 0;
float extra_frac = 0;
struct css_length size;
size.unit = CSS_UNIT_EM;
size.value = 10;
assert(block->type == BOX_BLOCK ||
block->type == BOX_INLINE_BLOCK ||
@ -496,6 +499,15 @@ void layout_minmax_block(struct box *block)
if (block->max_width != UNKNOWN_MAX_WIDTH)
return;
if (block->gadget && (block->gadget->type == GADGET_TEXTBOX ||
block->gadget->type == GADGET_PASSWORD ||
block->gadget->type == GADGET_FILE ||
block->gadget->type == GADGET_TEXTAREA)) {
assert(block->style);
min = max = css_len2px(&size, block->style);
}
if (block->object) {
if (block->object->type == CONTENT_HTML) {
layout_minmax_block(block->object->data.html.layout);
@ -776,7 +788,8 @@ void layout_float_find_dimensions(int available_width,
padding[BOTTOM] += scrollbar_width;
if (box->object && box->object->type != CONTENT_HTML) {
/* floating replaced element, see 10.3.6 and 10.6.2 */
/* Floating replaced element, with intrinsic width or height.
* See 10.3.6 and 10.6.2 */
if (width == AUTO && height == AUTO) {
width = box->object->width;
height = box->object->height;
@ -786,9 +799,43 @@ void layout_float_find_dimensions(int available_width,
else if (height == AUTO)
height = box->object->height * (float) width /
box->object->width;
} else if (box->gadget && (box->gadget->type == GADGET_TEXTBOX ||
box->gadget->type == GADGET_PASSWORD ||
box->gadget->type == GADGET_FILE ||
box->gadget->type == GADGET_TEXTAREA)) {
/* Give sensible dimensions to gadgets, with auto width/height,
* that don't shrink to fit contained text. */
assert(box->style);
struct css_length size;
size.unit = CSS_UNIT_EM;
if (box->gadget->type == GADGET_TEXTBOX ||
box->gadget->type == GADGET_PASSWORD ||
box->gadget->type == GADGET_FILE) {
if (width == AUTO) {
size.value = 10;
width = css_len2px(&size, box->style);
}
if (box->gadget->type == GADGET_FILE &&
height == AUTO) {
size.value = 1.5;
height = css_len2px(&size, box->style);
}
}
if (box->gadget->type == GADGET_TEXTAREA) {
if (width == AUTO) {
size.value = 10;
width = css_len2px(&size, box->style);
}
if (height == AUTO) {
size.value = 4;
height = css_len2px(&size, box->style);
}
}
} else if (width == AUTO) {
/* CSS 2.1 section 10.3.5 */
width = min(max(box->min_width, available_width), box->max_width);
width = min(max(box->min_width, available_width),
box->max_width);
width -= box->margin[LEFT] + box->border[LEFT] +
box->padding[LEFT] + box->padding[RIGHT] +
box->border[RIGHT] + box->margin[RIGHT];
@ -1145,6 +1192,9 @@ bool layout_line(struct box *first, int *width, int *y,
int space_before = 0, space_after = 0;
unsigned int inline_count = 0;
unsigned int i;
struct css_length gadget_size; /* Checkbox / radio buttons */
gadget_size.unit = CSS_UNIT_EM;
gadget_size.value = 1;
LOG(("first %p, first->text '%.*s', width %i, y %i, cx %i, cy %i",
first, (int) first->length, first->text, *width,
@ -1167,7 +1217,8 @@ bool layout_line(struct box *first, int *width, int *y,
* this is the line-height if there are text children and also in the
* case of an initially empty text input */
if (has_text_children || first->parent->parent->gadget)
used_height = height = line_height(first->parent->parent->style);
used_height = height =
line_height(first->parent->parent->style);
else
/* inline containers with no text are usually for layout and
* look better with no minimum line-height */
@ -1354,10 +1405,9 @@ bool layout_line(struct box *first, int *width, int *y,
} else {
/* form control with no object */
if (b->width == AUTO)
b->width = 0;
b->width = css_len2px(&gadget_size, b->style);
if (b->height == AUTO)
b->height = line_height(b->style ? b->style :
b->parent->parent->style);
b->height = css_len2px(&gadget_size, b->style);
}
if (b->object && b->object->type == CONTENT_HTML &&
@ -1484,12 +1534,7 @@ bool layout_line(struct box *first, int *width, int *y,
x1 -= b->width;
right = b;
}
/* Heed any previous clear */
if (cy < cont->clear_level) {
b->y = cont->clear_level;
} else {
b->y = cy;
}
b->y = cy;
} else {
/* cleared or doesn't fit */
/* place below into next available space */