mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-23 14:59:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix basic rearrangement of tree nodes

Browse Source 
svn path=/trunk/netsurf/; revision=5567
This commit is contained in:
Chris Young 2008-10-13 22:34:54 +00:00
parent b3f32dece4
commit 227993f481
3 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
amiga/gui.h
View File

@ -56,6 +56,7 @@ enum
GID_CANCEL,
GID_TREEBROWSER,
GID_OPEN,
GID_LEFT,
GID_UP,
GID_DOWN,
GID_NEWF,

62
amiga/tree.c
View File

@ -38,7 +38,7 @@
void ami_add_elements(struct treeview_window *twin,struct node *root,WORD *gen);
bool ami_tree_launch_node(struct tree *tree, struct node *node);
void free_browserlist(struct List *list);
void ami_move_node(struct treeview_window *twin,bool up);
void ami_move_node(struct treeview_window *twin,int move);
void ami_new_bookmark(struct treeview_window *twin);
void ami_recreate_listbrowser(struct treeview_window *twin);
@ -283,6 +283,12 @@ void ami_open_tree(struct tree *tree,int type)
GA_RelVerify,TRUE,
GA_Disabled,nothl,
ButtonEnd,
LAYOUT_AddChild, twin->gadgets[GID_LEFT] = ButtonObject,
GA_ID,GID_LEFT,
BUTTON_AutoButton,BAG_LFARROW,
GA_RelVerify,TRUE,
GA_Disabled,nothl, //(!tree->movable),
ButtonEnd,
LAYOUT_AddChild, twin->gadgets[GID_UP] = ButtonObject,
GA_ID,GID_UP,
BUTTON_AutoButton,BAG_UPARROW,
@ -550,11 +556,15 @@ BOOL ami_tree_event(struct treeview_window *twin)
break;
case GID_UP:
ami_move_node(twin,true);
ami_move_node(twin,AMI_MOVE_UP);
break;
case GID_DOWN:
ami_move_node(twin,false);
ami_move_node(twin,AMI_MOVE_DOWN);
break;
case GID_LEFT:
ami_move_node(twin,AMI_MOVE_OUT);
break;
case GID_DEL:
@ -591,35 +601,47 @@ BOOL ami_tree_event(struct treeview_window *twin)
return FALSE;
}
void ami_move_node(struct treeview_window *twin,bool up)
void ami_move_node(struct treeview_window *twin,int move)
{
struct Node *lbnode = NULL;
struct node *treenode,*moveto;
BOOL sel = FALSE;
bool before;
GetAttr(LISTBROWSER_SelectedNode,twin->gadgets[GID_TREEBROWSER],(ULONG *)&lbnode);
if(lbnode)
{
GetListBrowserNodeAttrs(lbnode,
LBNA_UserData,(ULONG *)&treenode,
// for multiselects? LBNA_Selected,(BOOL *)&sel,
TAG_DONE);
}
if(!lbnode) return;
GetListBrowserNodeAttrs(lbnode,
LBNA_UserData,(ULONG *)&treenode,
// for multiselects? LBNA_Selected,(BOOL *)&sel,
TAG_DONE);
tree_set_node_selected(twin->tree,twin->tree->root,false);
tree_set_node_selected(twin->tree,treenode,true);
if(up)
switch(move)
{
moveto = treenode->previous;
}
else
{
moveto = treenode->next;
case AMI_MOVE_UP:
moveto = treenode->previous;
before = true;
break;
case AMI_MOVE_DOWN:
moveto = treenode->next;
before = false;
break;
case AMI_MOVE_OUT:
moveto = treenode->parent->previous;
before = false;
break;
}
tree_move_selected_nodes(twin->tree,moveto,up);
tree_set_node_selected(twin->tree,treenode,false);
if(!moveto) return;
tree_delink_node(treenode);
//tree_move_selected_nodes(twin->tree,moveto,before);
tree_link_node(moveto,treenode,before);
ami_recreate_listbrowser(twin);
}

7
amiga/tree.h
View File

@ -40,6 +40,13 @@ enum
AMI_TREE_COOKIES
};
enum
{
AMI_MOVE_UP,
AMI_MOVE_DOWN,
AMI_MOVE_OUT
};
void ami_open_tree(struct tree *tree,int type);
void ami_tree_close(struct treeview_window *twin);
BOOL ami_tree_event(struct treeview_window *twin);