From: Richard L. <rl...@us...> - 2006-01-09 15:39:59
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24304/src Modified Files: gtkconv.c Log Message: Part of SF Patch #1400162 from Sadrul "This should make the tab-dragging arrows appear in the right places for tabs on the side/side-vertical." I'm basically trusting Sadrul on this one. Index: gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.718 retrieving revision 1.719 diff -u -d -p -r1.718 -r1.719 --- gtkconv.c 5 Jan 2006 20:17:36 -0000 1.718 +++ gtkconv.c 9 Jan 2006 15:39:51 -0000 1.719 @@ -5819,6 +5819,11 @@ gaim_gtkconv_get_tab_at_xy(GaimGtkWindow } } + if (page_num == -1) { + /* Add after the last tab */ + page_num = count - 1; + } + return page_num; } @@ -6606,15 +6611,13 @@ notebook_motion_cb(GtkWidget *widget, Gd } arrow1_y = nb_y + tab->allocation.y; - arrow2_y = nb_y + tab->allocation.y + - tab->allocation.height; + arrow2_y = nb_y + tab->allocation.y + tab->allocation.height; } else { arrow1_x = nb_x + tab->allocation.x; - arrow2_x = nb_x + tab->allocation.x + - tab->allocation.width; - arrow1_y = arrow2_y = nb_y + tab->allocation.y + tab->allocation.height/2; + arrow2_x = nb_x + tab->allocation.x + tab->allocation.width; + arrow1_y = arrow2_y = nb_y + tab->allocation.y; - if ((gpointer)win == (gpointer)dest_win && win->drag_tab < page_num) { + if (((gpointer)win == (gpointer)dest_win && win->drag_tab < page_num) || to_right) { arrow1_y += tab->allocation.height; arrow2_y += tab->allocation.height; } |