pidgin: src/gtkconv.c comparison

comparison src/gtkconv.c @ 11614:f72607814e4a

[gaim-migrate @ 13888] sadrul fixed that dragging to the right of the tab in another window thing, and i modified it a little, because i'm picky or something committer: Tailor Script <tailor@pidgin.im>

author	Tim Ringenbach <marv@pidgin.im>
date	Wed, 05 Oct 2005 02:08:23 +0000
parents	d15a1d755417
children	d09d94db1a89

comparison

equal deleted inserted replaced

-:d15a1d755417
+:f72607814e4a
 static GtkWidget *warn_close_dialog = NULL;
 static gboolean update_send_to_selection(GaimGtkWindow *win);
 static void generate_send_to_items(GaimGtkWindow *win);
 /* Prototypes. <-- because Paco-Paco hates this comment. */
 static void got_typing_keypress(GaimGtkConversation *gtkconv, gboolean first);
 static void gray_stuff_out(GaimGtkConversation *gtkconv);
 static GList *generate_invite_user_names(GaimConnection *gc);
 static void add_chat_buddy_common(GaimConversation *conv, const char *name,
 	if (win != NULL && gaim_gtk_conv_window_is_active_conversation(conv))
 		gray_stuff_out(GAIM_GTK_CONVERSATION(conv));
 }
 int
-gaim_gtkconv_get_tab_at_xy(GaimGtkWindow *win, int x, int y)
+gaim_gtkconv_get_tab_at_xy(GaimGtkWindow *win, int x, int y, gboolean *to_right)
 {
 	gint nb_x, nb_y, x_rel, y_rel;
 	GtkNotebook *notebook;
 	GtkWidget *page, *tab;
 	gint i, page_num = -1;
 	gint count;
 	gboolean horiz;
+	if (to_right)
+		*to_right = FALSE;
 	notebook = GTK_NOTEBOOK(win->notebook);
 	gdk_window_get_origin(win->notebook->window, &nb_x, &nb_y);
 	x_rel = x - nb_x;
 	y_rel = y - nb_y;
 		if (horiz) {
 			if (x_rel >= tab->allocation.x - GAIM_HIG_BOX_SPACE &&
 					x_rel <= tab->allocation.x + tab->allocation.width + GAIM_HIG_BOX_SPACE) {
 				page_num = i;
+				if (to_right && x_rel >= tab->allocation.x + tab->allocation.width/2)
+					*to_right = TRUE;
 				break;
 			}
 		} else {
 			if (y_rel >= tab->allocation.y - GAIM_HIG_BOX_SPACE &&
 					y_rel <= tab->allocation.y + tab->allocation.height + GAIM_HIG_BOX_SPACE) {
 				page_num = i;
+				if (to_right && y_rel >= tab->allocation.y + tab->allocation.height/2)
+					*to_right = TRUE;
 				break;
 			}
 		}
 	}
 {
 	if (GTK_WIDGET_STATE(widget) == GTK_STATE_ACTIVE)
 		gtk_widget_set_state(widget, GTK_STATE_NORMAL);
 }
 static void
 notebook_init_grab(GaimGtkWindow *gtkwin, GtkWidget *widget)
 {
 	static GdkCursor *cursor = NULL;
 		GtkNotebook *dest_notebook;
 		GtkWidget *tab;
 		gint nb_x, nb_y, page_num;
 		gint arrow1_x, arrow1_y, arrow2_x, arrow2_y;
 		gboolean horiz_tabs = FALSE;
+		GaimGtkConversation *gtkconv;
+		gboolean to_right = FALSE;
 		/* Get the window that the cursor is over. */
 		dest_win = gaim_gtk_conv_window_get_at_xy(e->x_root, e->y_root);
 		if (dest_win == NULL) {
 			dnd_hints_hide_all();
 			return TRUE;
 		}
 		dest_notebook = GTK_NOTEBOOK(dest_win->notebook);
 		gdk_window_get_origin(GTK_WIDGET(dest_notebook)->window, &nb_x, &nb_y);
 		arrow1_x = arrow2_x = nb_x;
 		arrow1_y = arrow2_y = nb_y;
 		page_num = gaim_gtkconv_get_tab_at_xy(dest_win,
-		                                      e->x_root, e->y_root);
+		                                      e->x_root, e->y_root, &to_right);
+		to_right = to_right && (win != dest_win);
 		if (gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_TOP ||
 		    gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_BOTTOM) {
 			    horiz_tabs = TRUE;
 		    }
-		tab = gaim_gtk_conv_window_get_gtkconv_at_index(dest_win, page_num)->tabby;
+		gtkconv = gaim_gtk_conv_window_get_gtkconv_at_index(dest_win, page_num);
+		tab = gtkconv->tabby;
 		if (horiz_tabs) {
 			arrow1_x = arrow2_x = nb_x + tab->allocation.x;
-			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_x += tab->allocation.width;
 				arrow2_x += tab->allocation.width;
 			}
 			arrow1_y = nb_y + tab->allocation.y;
 	/*
 	* Make sure a tab was actually clicked. The arrow buttons
 	* mess things up.
 	*/
-	tab_clicked = gaim_gtkconv_get_tab_at_xy(win, e->x_root, e->y_root);
+	tab_clicked = gaim_gtkconv_get_tab_at_xy(win, e->x_root, e->y_root, NULL);
 	if (tab_clicked == -1)
 		return FALSE;
 	/*
 	GaimGtkWindow *dest_win;
 	GaimConversation *conv;
 	GaimGtkConversation *gtkconv;
 	gint dest_page_num = 0;
 	gboolean new_window = FALSE;
+	gboolean to_right = FALSE;
 	/*
 	* Don't check to make sure that the event's window matches the
 	* widget's, because we may be getting an event passed on from the
 	* close button.
 	                 "conversation-dragging", win, dest_win);
 	/* Get the destination page number. */
 	if (!new_window)
 		dest_page_num = gaim_gtkconv_get_tab_at_xy(dest_win,
-		                                           e->x_root, e->y_root);
+		                                           e->x_root, e->y_root, &to_right);
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 	if (win == dest_win) {
 		gtk_notebook_reorder_child(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, dest_page_num);
 	} else {
 		gaim_gtk_conv_window_remove_gtkconv(win, gtkconv);
 		gaim_gtk_conv_window_add_gtkconv(dest_win, gtkconv);
-		gtk_notebook_reorder_child(GTK_NOTEBOOK(dest_win->notebook), gtkconv->tab_cont, dest_page_num);
+		gtk_notebook_reorder_child(GTK_NOTEBOOK(dest_win->notebook), gtkconv->tab_cont, dest_page_num + to_right);
 		gaim_gtk_conv_window_switch_gtkconv(dest_win, gtkconv);
 		if (new_window) {
 			gint win_width, win_height;
 			gtk_window_get_size(GTK_WINDOW(dest_win->window),

Mercurial > pidgin

comparison src/gtkconv.c @ 11614:f72607814e4a