Author: chris_y Date: Fri Oct 29 12:40:36 2010 New Revision: 10917 URL: http://source.netsurf-browser.org?rev=10917&view=rev Log: Allow getting the tree's drag property. This ensures we can see whether the current drag is something we might need to display an icon for. Modified: trunk/netsurf/amiga/download.c trunk/netsurf/amiga/tree.c trunk/netsurf/desktop/tree.c trunk/netsurf/desktop/tree.h Modified: trunk/netsurf/amiga/download.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.c?rev=1091... ============================================================================== --- trunk/netsurf/amiga/download.c (original) +++ trunk/netsurf/amiga/download.c Fri Oct 29 12:40:36 2010 @@ -512,7 +512,7 @@ ami_update_pointer(win, GUI_POINTER_DEFAULT); } - if(type == "drawer") deftype = WBDRAWER; + if(!strcmp(type, "drawer")) deftype = WBDRAWER; dobj = GetIconTags(NULL, ICONGETA_GetDefaultName, type, ICONGETA_GetDefaultType, deftype, Modified: trunk/netsurf/amiga/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=10917&am... ============================================================================== --- trunk/netsurf/amiga/tree.c (original) +++ trunk/netsurf/amiga/tree.c Fri Oct 29 12:40:36 2010 @@ -265,6 +265,19 @@ ami_tree_draw(twin); } +void ami_tree_drag_icon_show(struct treeview_window *twin) +{ + if(tree_node_is_folder( + tree_get_selected_node( + tree_get_root(twin->tree)))) + { + ami_drag_icon_show(twin->win, "drawer"); + } + else + { + ami_drag_icon_show(twin->win, "html"); + } +} void ami_tree_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg) { @@ -688,8 +701,6 @@ { int drag_x_move = 0, drag_y_move = 0; - /* TODO: Show drag icons on TREE_MOVE_DRAG start. - * Until then, the below line does nothing. */ ami_drag_icon_move(); if(twin->win->MouseX < bbox->Left) @@ -718,7 +729,8 @@ BROWSER_MOUSE_DRAG_ON; if(twin->drag_x == 0) twin->drag_x = x; if(twin->drag_y == 0) twin->drag_y = y; - + if(tree_drag_status(twin->tree) == TREE_MOVE_DRAG) + ami_tree_drag_icon_show(twin); } else if(twin->mouse_state & BROWSER_MOUSE_PRESS_2) { @@ -728,6 +740,8 @@ BROWSER_MOUSE_DRAG_ON; if(twin->drag_x == 0) twin->drag_x = x; if(twin->drag_y == 0) twin->drag_y = y; + if(tree_drag_status(twin->tree) == TREE_MOVE_DRAG) + ami_tree_drag_icon_show(twin); } else { Modified: trunk/netsurf/desktop/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=10917&... ============================================================================== --- trunk/netsurf/desktop/tree.c (original) +++ trunk/netsurf/desktop/tree.c Fri Oct 29 12:40:36 2010 @@ -39,13 +39,6 @@ #include "utils/messages.h" #include "utils/utils.h" #include "utils/url.h" - -typedef enum { - TREE_NO_DRAG = 0, - TREE_SELECT_DRAG, - TREE_MOVE_DRAG -} tree_drag_type; - #define MAXIMUM_URL_LENGTH 1024 @@ -1431,6 +1424,18 @@ /** + * Get the drag state of a tree + * + * \param tree the tree to get the state of + * \return drag type (defined in desktop/tree.h) + */ +tree_drag_type tree_drag_status(struct tree *tree) +{ + return tree->drag; +} + + +/** * Returns the first child of a node * * \param node the node to get the child of Modified: trunk/netsurf/desktop/tree.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.h?rev=10917&... ============================================================================== --- trunk/netsurf/desktop/tree.h (original) +++ trunk/netsurf/desktop/tree.h Fri Oct 29 12:40:36 2010 @@ -62,6 +62,12 @@ struct tree; struct node; struct node_element; + +typedef enum { + TREE_NO_DRAG = 0, + TREE_SELECT_DRAG, + TREE_MOVE_DRAG +} tree_drag_type; typedef enum { NODE_ELEMENT_TEXT, /**< Text only */ @@ -163,7 +169,7 @@ const char *tree_node_element_get_text(struct node_element *element); struct node *tree_get_root(struct tree *tree); bool tree_is_edited(struct tree *tree); - +tree_drag_type tree_drag_status(struct tree *tree); /* functions for traversing the tree */ struct node *tree_node_get_child(struct node *node);