From 4aadb2d013d5d99e2e92d796e097fae8c73e931e Mon Sep 17 00:00:00 2001 From: James Bursa Date: Fri, 19 Sep 2003 23:36:17 +0000 Subject: [project @ 2003-09-19 23:36:17 by bursa] Start converting forms to use CSS properly. svn path=/import/netsurf/; revision=305 --- render/box.c | 23 ++++++++++++++++ render/layout.c | 83 ++++----------------------------------------------------- 2 files changed, 28 insertions(+), 78 deletions(-) (limited to 'render') diff --git a/render/box.c b/render/box.c index c5b63464a..789b49356 100644 --- a/render/box.c +++ b/render/box.c @@ -524,6 +524,27 @@ struct css_style * box_get_style(struct content ** stylesheet, xmlFree(s); } + if (strcmp((const char *) n->name, "input") == 0) { + if ((s = (char *) xmlGetProp(n, (const xmlChar *) "size"))) { + int size = atoi(s); + if (0 < size) { + char *type = (char *) xmlGetProp(n, (const xmlChar *) "type"); + style->width.width = CSS_WIDTH_LENGTH; + if (!type || stricmp(type, "text") == 0 || + stricmp(type, "password") == 0) + /* in characters for text or password */ + style->width.value.length.unit = CSS_UNIT_EX; + else + /* in pixels otherwise */ + style->width.value.length.unit = CSS_UNIT_PX; + style->width.value.length.value = size; + if (type) + xmlFree(type); + } + xmlFree(s); + } + } + if (strcmp((const char *) n->name, "body") == 0) { if ((s = (char *) xmlGetProp(n, (const xmlChar *) "text"))) { unsigned int r, g, b; @@ -773,6 +794,7 @@ struct result box_input(xmlNode *n, struct status *status, if (type == 0 || stricmp(type, "text") == 0) { box = box_create(style, NULL, 0); + box->font = font_open(status->content->data.html.fonts, style); box->gadget = gadget = xcalloc(1, sizeof(struct gui_gadget)); gadget->type = GADGET_TEXTBOX; @@ -801,6 +823,7 @@ struct result box_input(xmlNode *n, struct status *status, else if (stricmp(type, "password") == 0) { box = box_create(style, NULL, 0); + box->font = font_open(status->content->data.html.fonts, style); box->gadget = gadget = xcalloc(1, sizeof(struct gui_gadget)); gadget->type = GADGET_PASSWORD; diff --git a/render/layout.c b/render/layout.c index 3dbc5e464..0adc2e85e 100644 --- a/render/layout.c +++ b/render/layout.c @@ -95,69 +95,6 @@ void layout_node(struct box * box, unsigned long width, struct box * cont, } -/* TODO: change this to use style sheets */ -int gadget_width(struct gui_gadget* gadget) -{ - struct formoption* current; - int max; - - /* should use wimp_textop via a gui wrapper for these */ - switch (gadget->type) - { - case GADGET_CHECKBOX: - case GADGET_RADIO: - return 22; - case GADGET_TEXTBOX: - return gadget->data.textbox.size * 8; - case GADGET_PASSWORD: - return gadget->data.password.size * 8; - case GADGET_ACTIONBUTTON: - return strlen(gadget->data.actionbutt.label) * 8 + 16; - case GADGET_IMAGE: - return gadget->data.image.width; - case GADGET_SELECT: - current = gadget->data.select.items; - max = 32; - while (current != NULL) - { - if (strlen(current->text) * 8 + 16 > max) - max = strlen(current->text) * 8 + 16; - current = current->next; - } - return max; - case GADGET_TEXTAREA: - return gadget->data.textarea.cols * 8 + 8; - default: - assert(0); - } - return 0; -} - -int gadget_height(struct gui_gadget* gadget) -{ - switch (gadget->type) - { - case GADGET_CHECKBOX: - case GADGET_RADIO: - return 22; - case GADGET_TEXTBOX: - return 28; - case GADGET_PASSWORD: - return 28; - case GADGET_ACTIONBUTTON: - return 28; - case GADGET_IMAGE: - return gadget->data.image.height; - case GADGET_SELECT: - return 28; // * gadget->data.select.size; - case GADGET_TEXTAREA: - return gadget->data.textarea.rows * 16 + 8; - default: - assert(0); - } - return 0; -} - /** * layout_block -- position block and recursively layout children * @@ -354,28 +291,24 @@ struct box * layout_line(struct box * first, unsigned long width, unsigned long for (x = 0, b = first; x < x1 - x0 && b != 0; b = b->next) { assert(b->type == BOX_INLINE || b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT); if (b->type == BOX_INLINE) { - if (b->object && b->style && b->style->height.height == CSS_HEIGHT_LENGTH) + if ((b->object || b->gadget) && b->style && b->style->height.height == CSS_HEIGHT_LENGTH) h = len(&b->style->height.length, b->style); else if (b->text) h = line_height(b->style ? b->style : b->parent->parent->style); - else if (b->gadget != 0) - h = gadget_height(b->gadget); else h = 0; b->height = h; if (h > height) height = h; - if (b->object && b->style && b->style->width.width == CSS_WIDTH_LENGTH) + if ((b->object || b->gadget) && b->style && b->style->width.width == CSS_WIDTH_LENGTH) b->width = len(&b->style->width.value.length, b->style); - else if (b->object && b->style && b->style->width.width == CSS_WIDTH_PERCENT) + else if ((b->object || b->gadget) && b->style && b->style->width.width == CSS_WIDTH_PERCENT) b->width = width * b->style->width.value.percent / 100; else if (b->text) { if (b->width == UNKNOWN_WIDTH) b->width = font_width(b->font, b->text, b->length); - } else if (b->gadget != 0) - b->width = gadget_width(b->gadget); - else + } else b->width = 0; if (b->text != 0) @@ -885,7 +818,7 @@ void calculate_inline_container_widths(struct box *box) for (child = box->children; child != 0; child = child->next) { switch (child->type) { case BOX_INLINE: - if (child->object) { + if (child->object || child->gadget) { if (child->style->width.width == CSS_WIDTH_LENGTH) { child->width = len(&child->style->width.value.length, child->style); @@ -910,12 +843,6 @@ void calculate_inline_container_widths(struct box *box) if (min < width) min = width; i = j + 1; } while (j != child->length); - - } else if (child->gadget) { - child->width = gadget_width(child->gadget); - max += child->width; - if (min < child->width) - min = child->width; } break; -- cgit v1.2.3