netsurf: branch master updated. release/3.8-70-g9501c9e

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/9501c9e68d336f894470d... ...commit http://git.netsurf-browser.org/netsurf.git/commit/9501c9e68d336f894470d45... ...tree http://git.netsurf-browser.org/netsurf.git/tree/9501c9e68d336f894470d45a3... The branch, master has been updated via 9501c9e68d336f894470d45a317f9a2123dcca80 (commit) via 83798a83b77be8c6cf3778c93ac5e0611865935b (commit) via c6f92f2f2a8a3d16c9c4e791049a3c7c93854c07 (commit) from 413929dad5a0bffc41d0c66df9cc80689a23c00f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9501c9e68d336f89447... commit 9501c9e68d336f894470d45a317f9a2123dcca80 Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Treeview: Consider search bar for redraw area calculation. diff --git a/desktop/treeview.c b/desktop/treeview.c index 5bbac1e..27f6e22 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -3441,7 +3441,7 @@ static bool treeview_delete_selection(treeview *tree, struct rect *rect) sw.purpose = TREEVIEW_WALK_DELETE_SELECTION; sw.data.redraw.required = false; sw.data.redraw.rect = rect; - sw.current_y = 0; + sw.current_y = treeview__get_search_height(tree); sw.tree = tree; treeview_walk_internal(tree, tree->root, @@ -3474,7 +3474,7 @@ static bool treeview_propagate_selection(treeview *tree, struct rect *rect) sw.purpose = TREEVIEW_WALK_PROPAGATE_SELECTION; sw.data.redraw.required = false; sw.data.redraw.rect = rect; - sw.current_y = 0; + sw.current_y = treeview__get_search_height(tree); sw.tree = tree; treeview_walk_internal(tree, tree->root, commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=83798a83b77be8c6cf3... commit 83798a83b77be8c6cf3778c93ac5e0611865935b Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Treeview: Use helper to get tree height. diff --git a/desktop/treeview.c b/desktop/treeview.c index 2915ccc..5bbac1e 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -3436,7 +3436,7 @@ static bool treeview_delete_selection(treeview *tree, struct rect *rect) rect->x0 = 0; rect->y0 = 0; rect->x1 = REDRAW_MAX; - rect->y1 = tree->root->height; + rect->y1 = treeview__get_display_height(tree); sw.purpose = TREEVIEW_WALK_DELETE_SELECTION; sw.data.redraw.required = false; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=c6f92f2f2a8a3d16c9c... commit c6f92f2f2a8a3d16c9c4e791049a3c7c93854c07 Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Treeview: Consolidate search bar height calculation. diff --git a/desktop/treeview.c b/desktop/treeview.c index 3db90cc..2915ccc 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -358,6 +358,20 @@ static inline void treeview__cw_invalidate_area( /** + * Get height used by treeview's search bar (or 0 if not present). + * + * \param tree Treeview object to check. + * \return height used by search bar in pixels. + */ +static inline unsigned treeview__get_search_height( + const treeview *tree) +{ + return (tree->flags & TREEVIEW_SEARCHABLE) ? + tree_g.line_height : 0; +} + + +/** * Corewindow callback wrapper: Update the limits of the window * * \param[in] tree The treeview to update size for. @@ -368,12 +382,9 @@ static inline void treeview__cw_update_size( const struct treeview *tree, int width, int height) { - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; - if (tree->cw_t != NULL) { tree->cw_t->update_size(tree->cw_h, width, - height + search_height); + height + treeview__get_search_height(tree)); } } @@ -501,7 +512,7 @@ static inline treeview_node * treeview_node_next(treeview_node *node, bool full) */ static treeview_node * treeview_y_node(treeview *tree, int target_y) { - int y = (tree->flags & TREEVIEW_SEARCHABLE) ? tree_g.line_height : 0; + int y = treeview__get_search_height(tree); treeview_node *n; assert(tree != NULL); @@ -535,7 +546,7 @@ static int treeview_node_y( const treeview_node *node) { treeview_node *n; - int y = (tree->flags & TREEVIEW_SEARCHABLE) ? tree_g.line_height : 0; + int y = treeview__get_search_height(tree); assert(tree != NULL); assert(tree->root != NULL); @@ -563,13 +574,12 @@ static void treeview__redraw_from_node( const treeview *tree, const treeview_node *node) { - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; struct rect r = { .x0 = 0, .y0 = treeview_node_y(tree, node), .x1 = REDRAW_MAX, - .y1 = treeview__get_display_height(tree) + search_height, + .y1 = treeview__get_display_height(tree) + + treeview__get_search_height(tree), }; assert(tree != NULL); @@ -816,8 +826,7 @@ static nserror treeview__search( nserror err; uint32_t height; uint32_t prev_height = treeview__get_display_height(tree); - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + int search_height = treeview__get_search_height(tree); struct treeview_search_walk_data sw = { .len = len, .text = text, @@ -2329,8 +2338,7 @@ nserror treeview_node_contract(treeview *tree, treeview_node *node) /* Exported interface, documented in treeview.h */ nserror treeview_contract(treeview *tree, bool all) { - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + int search_height = treeview__get_search_height(tree); struct treeview_contract_data data; bool selected; treeview_node *n; @@ -3295,8 +3303,7 @@ static bool treeview_clear_selection(treeview *tree, struct rect *rect) sw.purpose = TREEVIEW_WALK_CLEAR_SELECTION; sw.data.redraw.required = false; sw.data.redraw.rect = rect; - sw.current_y = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + sw.current_y = treeview__get_search_height(tree); treeview_walk_internal(tree, tree->root, TREEVIEW_WALK_MODE_DISPLAY, NULL, @@ -3325,8 +3332,7 @@ static bool treeview_select_all(treeview *tree, struct rect *rect) sw.purpose = TREEVIEW_WALK_SELECT_ALL; sw.data.redraw.required = false; sw.data.redraw.rect = rect; - sw.current_y = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + sw.current_y = treeview__get_search_height(tree); treeview_walk_internal(tree, tree->root, TREEVIEW_WALK_MODE_DISPLAY, NULL, @@ -3346,8 +3352,7 @@ static void treeview_commit_selection_drag(treeview *tree) struct treeview_selection_walk_data sw; sw.purpose = TREEVIEW_WALK_COMMIT_SELECT_DRAG; - sw.current_y = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + sw.current_y = treeview__get_search_height(tree); if (tree->drag.start.y > tree->drag.prev.y) { sw.data.drag.sel_min = tree->drag.prev.y; @@ -3797,8 +3802,7 @@ treeview_keyboard_navigation(treeview *tree, uint32_t key, struct rect *rect) .n_selected = 0, .prev_n_selected = 0 }; - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + int search_height = treeview__get_search_height(tree); int h = treeview__get_display_height(tree) + search_height; bool redraw = false; @@ -4614,8 +4618,7 @@ treeview_mouse_action(treeview *tree, browser_mouse_state mouse, int x, int y) { struct rect r; bool redraw = false; - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + int search_height = treeview__get_search_height(tree); assert(tree != NULL); assert(tree->root != NULL); @@ -4787,12 +4790,10 @@ treeview_mouse_action(treeview *tree, browser_mouse_state mouse, int x, int y) } } - /* Exported interface, documented in treeview.h */ int treeview_get_height(treeview *tree) { - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + int search_height = treeview__get_search_height(tree); int height = treeview__get_display_height(tree); assert(tree != NULL); ----------------------------------------------------------------------- Summary of changes: desktop/treeview.c | 59 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/desktop/treeview.c b/desktop/treeview.c index 3db90cc..27f6e22 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -358,6 +358,20 @@ static inline void treeview__cw_invalidate_area( /** + * Get height used by treeview's search bar (or 0 if not present). + * + * \param tree Treeview object to check. + * \return height used by search bar in pixels. + */ +static inline unsigned treeview__get_search_height( + const treeview *tree) +{ + return (tree->flags & TREEVIEW_SEARCHABLE) ? + tree_g.line_height : 0; +} + + +/** * Corewindow callback wrapper: Update the limits of the window * * \param[in] tree The treeview to update size for. @@ -368,12 +382,9 @@ static inline void treeview__cw_update_size( const struct treeview *tree, int width, int height) { - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; - if (tree->cw_t != NULL) { tree->cw_t->update_size(tree->cw_h, width, - height + search_height); + height + treeview__get_search_height(tree)); } } @@ -501,7 +512,7 @@ static inline treeview_node * treeview_node_next(treeview_node *node, bool full) */ static treeview_node * treeview_y_node(treeview *tree, int target_y) { - int y = (tree->flags & TREEVIEW_SEARCHABLE) ? tree_g.line_height : 0; + int y = treeview__get_search_height(tree); treeview_node *n; assert(tree != NULL); @@ -535,7 +546,7 @@ static int treeview_node_y( const treeview_node *node) { treeview_node *n; - int y = (tree->flags & TREEVIEW_SEARCHABLE) ? tree_g.line_height : 0; + int y = treeview__get_search_height(tree); assert(tree != NULL); assert(tree->root != NULL); @@ -563,13 +574,12 @@ static void treeview__redraw_from_node( const treeview *tree, const treeview_node *node) { - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; struct rect r = { .x0 = 0, .y0 = treeview_node_y(tree, node), .x1 = REDRAW_MAX, - .y1 = treeview__get_display_height(tree) + search_height, + .y1 = treeview__get_display_height(tree) + + treeview__get_search_height(tree), }; assert(tree != NULL); @@ -816,8 +826,7 @@ static nserror treeview__search( nserror err; uint32_t height; uint32_t prev_height = treeview__get_display_height(tree); - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + int search_height = treeview__get_search_height(tree); struct treeview_search_walk_data sw = { .len = len, .text = text, @@ -2329,8 +2338,7 @@ nserror treeview_node_contract(treeview *tree, treeview_node *node) /* Exported interface, documented in treeview.h */ nserror treeview_contract(treeview *tree, bool all) { - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + int search_height = treeview__get_search_height(tree); struct treeview_contract_data data; bool selected; treeview_node *n; @@ -3295,8 +3303,7 @@ static bool treeview_clear_selection(treeview *tree, struct rect *rect) sw.purpose = TREEVIEW_WALK_CLEAR_SELECTION; sw.data.redraw.required = false; sw.data.redraw.rect = rect; - sw.current_y = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + sw.current_y = treeview__get_search_height(tree); treeview_walk_internal(tree, tree->root, TREEVIEW_WALK_MODE_DISPLAY, NULL, @@ -3325,8 +3332,7 @@ static bool treeview_select_all(treeview *tree, struct rect *rect) sw.purpose = TREEVIEW_WALK_SELECT_ALL; sw.data.redraw.required = false; sw.data.redraw.rect = rect; - sw.current_y = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + sw.current_y = treeview__get_search_height(tree); treeview_walk_internal(tree, tree->root, TREEVIEW_WALK_MODE_DISPLAY, NULL, @@ -3346,8 +3352,7 @@ static void treeview_commit_selection_drag(treeview *tree) struct treeview_selection_walk_data sw; sw.purpose = TREEVIEW_WALK_COMMIT_SELECT_DRAG; - sw.current_y = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + sw.current_y = treeview__get_search_height(tree); if (tree->drag.start.y > tree->drag.prev.y) { sw.data.drag.sel_min = tree->drag.prev.y; @@ -3431,12 +3436,12 @@ static bool treeview_delete_selection(treeview *tree, struct rect *rect) rect->x0 = 0; rect->y0 = 0; rect->x1 = REDRAW_MAX; - rect->y1 = tree->root->height; + rect->y1 = treeview__get_display_height(tree); sw.purpose = TREEVIEW_WALK_DELETE_SELECTION; sw.data.redraw.required = false; sw.data.redraw.rect = rect; - sw.current_y = 0; + sw.current_y = treeview__get_search_height(tree); sw.tree = tree; treeview_walk_internal(tree, tree->root, @@ -3469,7 +3474,7 @@ static bool treeview_propagate_selection(treeview *tree, struct rect *rect) sw.purpose = TREEVIEW_WALK_PROPAGATE_SELECTION; sw.data.redraw.required = false; sw.data.redraw.rect = rect; - sw.current_y = 0; + sw.current_y = treeview__get_search_height(tree); sw.tree = tree; treeview_walk_internal(tree, tree->root, @@ -3797,8 +3802,7 @@ treeview_keyboard_navigation(treeview *tree, uint32_t key, struct rect *rect) .n_selected = 0, .prev_n_selected = 0 }; - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + int search_height = treeview__get_search_height(tree); int h = treeview__get_display_height(tree) + search_height; bool redraw = false; @@ -4614,8 +4618,7 @@ treeview_mouse_action(treeview *tree, browser_mouse_state mouse, int x, int y) { struct rect r; bool redraw = false; - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + int search_height = treeview__get_search_height(tree); assert(tree != NULL); assert(tree->root != NULL); @@ -4787,12 +4790,10 @@ treeview_mouse_action(treeview *tree, browser_mouse_state mouse, int x, int y) } } - /* Exported interface, documented in treeview.h */ int treeview_get_height(treeview *tree) { - int search_height = (tree->flags & TREEVIEW_SEARCHABLE) ? - tree_g.line_height : 0; + int search_height = treeview__get_search_height(tree); int height = treeview__get_display_height(tree); assert(tree != NULL); -- NetSurf Browser