diff options
| -rw-r--r-- | src/form.cc | 2 | ||||
| -rw-r--r-- | src/html.cc | 14 | ||||
| -rw-r--r-- | src/html_common.hh | 5 |
3 files changed, 8 insertions, 13 deletions
diff --git a/src/form.cc b/src/form.cc index eb4c3e59..9f1a7040 100644 --- a/src/form.cc +++ b/src/form.cc @@ -1911,7 +1911,7 @@ static Embed *Html_input_image(DilloHtml *html, const char *tag, int tagsize) html->styleEngine->setPseudoLink (); /* create new image and add it to the button */ - if ((Image = a_Html_add_new_image(html, tag, tagsize, url, false))) { + if ((Image = a_Html_image_new(html, tag, tagsize, url))) { IM2DW(Image)->setStyle (html->styleEngine->style ()); ResourceFactory *factory = HT2LT(html)->getResourceFactory(); ComplexButtonResource *complex_b_r = diff --git a/src/html.cc b/src/html.cc index 92c015d5..be85d47f 100644 --- a/src/html.cc +++ b/src/html.cc @@ -1931,9 +1931,8 @@ static void Html_tag_open_address(DilloHtml *html, * Read image-associated tag attributes, * create new image and add it to the html page (if add is TRUE). */ -DilloImage *a_Html_add_new_image(DilloHtml *html, const char *tag, - int tagsize, DilloUrl *url, - bool add) +DilloImage *a_Html_image_new(DilloHtml *html, const char *tag, + int tagsize, DilloUrl *url) { const int MAX_W = 6000, MAX_H = 6000; @@ -1973,7 +1972,7 @@ DilloImage *a_Html_add_new_image(DilloHtml *html, const char *tag, dFree(width_ptr); dFree(height_ptr); width_ptr = height_ptr = NULL; - MSG("a_Html_add_new_image: suspicious image size request %dx%d\n", w, h); + MSG("a_Html_image_new: suspicious image size request %dx%d\n", w, h); } else { if (CSS_LENGTH_TYPE(l_w) != CSS_LENGTH_TYPE_AUTO) props.set (CSS_PROPERTY_WIDTH, CSS_TYPE_LENGTH_PERCENTAGE, l_w); @@ -2041,10 +2040,6 @@ DilloImage *a_Html_add_new_image(DilloHtml *html, const char *tag, /* Add a new image widget to this page */ Image = a_Image_new(0, 0, alt_ptr, 0); - if (add) { - DW2TB(html->dw)->addWidget((Widget*)Image->dw, - html->styleEngine->style()); - } if (DW2TB(html->dw)->getBgColor()) Image->bg_color = DW2TB(html->dw)->getBgColor()->getColor(); @@ -2107,7 +2102,8 @@ static void Html_tag_open_img(DilloHtml *html, const char *tag, int tagsize) /* TODO: usemap URLs outside of the document are not used. */ usemap_url = a_Html_url_new(html, attrbuf, NULL, 0); - Image = a_Html_add_new_image(html, tag, tagsize, url, true); + Image = a_Html_image_new(html, tag, tagsize, url); + DW2TB(html->dw)->addWidget((Widget*)Image->dw, html->styleEngine->style()); /* Image maps */ if (a_Html_get_attr(html, tag, tagsize, "ismap")) { diff --git a/src/html_common.hh b/src/html_common.hh index fc0800f7..c69b0271 100644 --- a/src/html_common.hh +++ b/src/html_common.hh @@ -257,9 +257,8 @@ DilloUrl *a_Html_url_new(DilloHtml *html, const char *url_str, const char *base_url, int use_base_url); -DilloImage *a_Html_add_new_image(DilloHtml *html, const char *tag, - int tagsize, DilloUrl *url, - bool add); +DilloImage *a_Html_image_new(DilloHtml *html, const char *tag, + int tagsize, DilloUrl *url); char *a_Html_parse_entities(DilloHtml *html, const char *token, int toksize); void a_Html_pop_tag(DilloHtml *html, int TagIdx); |