comparison: src/gtkhtml.c
src/gtkhtml.c
- changeset 540
- d15cff284579
- parent 537
- 4fa432532bc0
- child 542
- 857ce3419e9c
equal
deleted
inserted
replaced
| 539:a62ff4f3335f | 540:d15cff284579 |
|---|---|
| 2696 | 2696 |
| 2697 last_hb = (GtkHtmlBit *) g_list_last(html->html_bits)->data; | 2697 last_hb = (GtkHtmlBit *) g_list_last(html->html_bits)->data; |
| 2698 | 2698 |
| 2699 /* make sure pixmaps drop down a line after a <BR> */ | 2699 /* make sure pixmaps drop down a line after a <BR> */ |
| 2700 if (last_hb->newline) | 2700 if (last_hb->newline) |
| 2701 html->current_y += private->height + 2; | 2701 html->current_y += private->height + 5; |
| 2702 | 2702 |
| 2703 /* wrap pixmaps */ | 2703 /* wrap pixmaps */ |
| 2704 gdk_window_get_size(html->html_area, &width, &height); | 2704 gdk_window_get_size(html->html_area, &width, &height); |
| 2705 if ((html->current_x + private->width) >= width) { | 2705 if ((html->current_x + private->width) >= width) { |
| 2706 html->current_y += private->height + 2; | 2706 html->current_y += private->height + 5; |
| 2707 html->current_x = 0; | 2707 html->current_x = 0; |
| 2708 } | 2708 } |
| 2709 | 2709 |
| 2710 hb->fit = fit; | 2710 hb->fit = fit; |
| 2711 hb->x = html->current_x; | 2711 hb->x = html->current_x; |
| 2727 hb->newline = newline; | 2727 hb->newline = newline; |
| 2728 hb->pm = pm; | 2728 hb->pm = pm; |
| 2729 | 2729 |
| 2730 if (html->current_x == BORDER_WIDTH) | 2730 if (html->current_x == BORDER_WIDTH) |
| 2731 { | 2731 { |
| 2732 html->current_y += hb->height; | 2732 html->current_y += hb->height + 3; |
| 2733 hb->y += hb->height; | 2733 hb->y += hb->height + 3; |
| 2734 } | 2734 } |
| 2735 | 2735 |
| 2736 | 2736 |
| 2737 html->current_x += hb->width; | 2737 html->current_x += hb->width; |
| 2738 | 2738 |
| 2822 h = (GtkHtmlBit *) hbits->data; | 2822 h = (GtkHtmlBit *) hbits->data; |
| 2823 h->newline++; | 2823 h->newline++; |
| 2824 if (html->current_x > 0) | 2824 if (html->current_x > 0) |
| 2825 html->current_x = 0; | 2825 html->current_x = 0; |
| 2826 else | 2826 else |
| 2827 html->current_y += cfont->ascent + cfont->descent + 2; | 2827 html->current_y += cfont->ascent + cfont->descent + 5; |
| 2828 return; | 2828 return; |
| 2829 } | 2829 } |
| 2830 | 2830 |
| 2831 | 2831 |
| 2832 | 2832 |
| 2931 } | 2931 } |
| 2932 | 2932 |
| 2933 | 2933 |
| 2934 if (html->current_x == 0) | 2934 if (html->current_x == 0) |
| 2935 { | 2935 { |
| 2936 html->current_y += height; | 2936 html->current_y += height + 3; |
| 2937 gdk_text_extents(cfont, text, 1, &lb, NULL, NULL, NULL, NULL); | 2937 gdk_text_extents(cfont, text, 1, &lb, NULL, NULL, NULL, NULL); |
| 2938 html->current_x += (2 - lb); | 2938 html->current_x += (2 - lb); |
| 2939 } | 2939 } |
| 2940 else if ((hbits = g_list_last(html->html_bits)) != NULL) | 2940 else if ((hbits = g_list_last(html->html_bits)) != NULL) |
| 2941 { | 2941 { |
