diff options
| -rw-r--r-- | desktop/browser.c | 2 | ||||
| -rw-r--r-- | desktop/frames.c | 10 | ||||
| -rw-r--r-- | desktop/tree.c | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 3e1c41fae..f6ca1aa75 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -1017,7 +1017,7 @@ void browser_window_set_scale_internal(struct browser_window *bw, float scale) int i; struct content *c; - if (bw->scale == scale) + if (fabs(bw->scale-scale) < 0.0001) return; bw->scale = scale; c = bw->current_content; diff --git a/desktop/frames.c b/desktop/frames.c index 4a172220a..e7c95e766 100644 --- a/desktop/frames.c +++ b/desktop/frames.c @@ -41,12 +41,6 @@ /** maximum frame resize margin */ #define FRAME_RESIZE 6 -/** browser window which is being redrawn. Valid only during redraw. */ -struct browser_window *current_redraw_browser; - -/** fake content for <a> being saved as a link */ -struct content browser_window_href_content; - static bool browser_window_resolve_frame_dimension(struct browser_window *bw, struct browser_window *sibling, int x, int y, bool width, bool height); @@ -561,7 +555,7 @@ bool browser_window_resolve_frame_dimension(struct browser_window *bw, struct br if (bw_d->unit == FRAME_DIMENSION_RELATIVE) { if ((sibling_pixels == 0) && (bw_dimension == 0)) return false; - if (sibling_d->value == 0) + if (fabs(sibling_d->value) < 0.0001) bw_d->value = 1; if (sibling_pixels == 0) sibling_d->value = (sibling_d->value * bw_pixels) / bw_dimension; @@ -574,7 +568,7 @@ bool browser_window_resolve_frame_dimension(struct browser_window *bw, struct br } else if (sibling_d->unit == FRAME_DIMENSION_RELATIVE) { if ((bw_pixels == 0) && (sibling_dimension == 0)) return false; - if (bw_d->value == 0) + if (fabs(bw_d->value) < 0.0001) bw_d->value = 1; if (bw_pixels == 0) bw_d->value = (bw_d->value * sibling_pixels) / sibling_dimension; diff --git a/desktop/tree.c b/desktop/tree.c index 9bc8eeac6..208483d6f 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -916,7 +916,7 @@ void tree_delete_node(struct tree *tree, struct node *node, bool siblings) { void tree_delete_node_internal(struct tree *tree, struct node *node, bool siblings) { struct node *next, *child; struct node_element *e, *f, *domain, *path; - char *domain_t, *path_t, name_t; + char *domain_t, *path_t, *name_t; char *space; assert(node); @@ -982,6 +982,7 @@ void tree_delete_node_internal(struct tree *tree, struct node *node, bool siblin } } if (e->sprite) { + /* TODO the type of this field is platform dependent */ free(e->sprite); /* \todo platform specific bits */ e->sprite = NULL; } |