aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-09-16 02:04:30 +0800
committerChristian Persch <chpe@src.gnome.org>2003-09-16 02:04:30 +0800
commitbdadef115c9a7e35ed092891cc30c477aa56e5c6 (patch)
tree95330b0a4fdf030b6a1dbaa79867076a6058dd63
parentfb5cf4145671c33d9bdfe26d824b537f0ea9e9da (diff)
downloadgsoc2013-epiphany-bdadef115c9a7e35ed092891cc30c477aa56e5c6.tar
gsoc2013-epiphany-bdadef115c9a7e35ed092891cc30c477aa56e5c6.tar.gz
gsoc2013-epiphany-bdadef115c9a7e35ed092891cc30c477aa56e5c6.tar.bz2
gsoc2013-epiphany-bdadef115c9a7e35ed092891cc30c477aa56e5c6.tar.lz
gsoc2013-epiphany-bdadef115c9a7e35ed092891cc30c477aa56e5c6.tar.xz
gsoc2013-epiphany-bdadef115c9a7e35ed092891cc30c477aa56e5c6.tar.zst
gsoc2013-epiphany-bdadef115c9a7e35ed092891cc30c477aa56e5c6.zip
Enable dragging the tab from a single-tab window too.
2003-09-15 Christian Persch <chpe@cvs.gnome.org> * src/ephy-notebook.c: (drag_start), (drag_stop), (motion_notify_cb), (move_tab_to_another_notebook), (button_release_cb), (ephy_notebook_init): Enable dragging the tab from a single-tab window too. Correctly honour the drag threshold when starting a drag (ported from galeon, tanks go to Crispin).
-rw-r--r--ChangeLog11
-rw-r--r--src/ephy-notebook.c57
2 files changed, 33 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 12d54efb7..f2049e2be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-09-15 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/ephy-notebook.c: (drag_start), (drag_stop),
+ (motion_notify_cb), (move_tab_to_another_notebook),
+ (button_release_cb), (ephy_notebook_init):
+
+ Enable dragging the tab from a single-tab window too.
+
+ Correctly honour the drag threshold when starting a drag
+ (ported from galeon, tanks go to Crispin).
+
2003-09-14 Christian Persch <chpe@cvs.gnome.org>
* data/default-prefs.js:
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 9600673cd..3c1e178f7 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -67,8 +67,6 @@ struct EphyNotebookPrivate
gint x_start, y_start;
gboolean drag_in_progress;
gboolean show_tabs;
- EphyNotebook *src_notebook;
- gint src_page;
};
static void ephy_notebook_init (EphyNotebook *notebook);
@@ -374,13 +372,9 @@ ephy_notebook_move_page (EphyNotebook *src, EphyNotebook *dest,
}
static void
-drag_start (EphyNotebook *notebook,
- EphyNotebook *src_notebook,
- gint src_page)
+drag_start (EphyNotebook *notebook)
{
notebook->priv->drag_in_progress = TRUE;
- notebook->priv->src_notebook = src_notebook;
- notebook->priv->src_page = src_page;
/* get a new cursor, if necessary */
if (!cursor) cursor = gdk_cursor_new (GDK_FLEUR);
@@ -404,8 +398,6 @@ drag_stop (EphyNotebook *notebook)
}
notebook->priv->drag_in_progress = FALSE;
- notebook->priv->src_notebook = NULL;
- notebook->priv->src_page = -1;
if (notebook->priv->motion_notify_handler_id != 0)
{
g_signal_handler_disconnect (G_OBJECT (notebook),
@@ -446,23 +438,19 @@ motion_notify_cb (EphyNotebook *notebook, GdkEventMotion *event,
gint page_num;
gint result;
- /* If the notebook only has one tab, we don't want to do
- * anything since ephy can't handle empty notebooks
- */
- if (g_list_length (GTK_NOTEBOOK (notebook)->children) <= 1) {
- return FALSE;
- }
-
- if ((notebook->priv->drag_in_progress == FALSE)
- && (gtk_drag_check_threshold (GTK_WIDGET (notebook),
- notebook->priv->x_start,
- notebook->priv->y_start,
- event->x_root, event->y_root)))
+ if (notebook->priv->drag_in_progress == FALSE)
{
- gint cur_page;
-
- cur_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
- drag_start (notebook, notebook, cur_page);
+ if (gtk_drag_check_threshold (GTK_WIDGET (notebook),
+ notebook->priv->x_start,
+ notebook->priv->y_start,
+ event->x_root, event->y_root))
+ {
+ drag_start (notebook);
+ }
+ else
+ {
+ return FALSE;
+ }
}
result = find_notebook_and_tab_at_pos ((gint)event->x_root,
@@ -498,21 +486,21 @@ move_tab_to_another_notebook(EphyNotebook *src,
* to that new notebook, and let this notebook handle the
* drag
*/
- g_assert (dest != NULL);
+ g_assert (EPHY_IS_NOTEBOOK (dest));
g_assert (dest != src);
- /* Move the widgets (tab label and tab content) to the new
- * notebook
- */
cur_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (src));
child = gtk_notebook_get_nth_page (GTK_NOTEBOOK (src), cur_page);
- ephy_notebook_move_page (src, dest, child, dest_page);
- /* "Give" drag handling to the new notebook */
- drag_start (dest, src->priv->src_notebook, src->priv->src_page);
+ /* stop drag in origin window */
drag_stop (src);
gtk_grab_remove (GTK_WIDGET (src));
+ ephy_notebook_move_page (src, dest, child, dest_page);
+
+ /* start drag handling in dest notebook */
+ drag_start (dest);
+
dest->priv->motion_notify_handler_id =
g_signal_connect (G_OBJECT (dest),
"motion-notify-event",
@@ -535,7 +523,8 @@ button_release_cb (EphyNotebook *notebook, GdkEventButton *event,
cur_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook),
cur_page_num);
- if (!is_in_notebook_window (notebook, event->x_root, event->y_root))
+ if (!is_in_notebook_window (notebook, event->x_root, event->y_root)
+ && gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)) > 1)
{
/* Tab was detached */
g_signal_emit (G_OBJECT (notebook),
@@ -742,8 +731,6 @@ ephy_notebook_init (EphyNotebook *notebook)
notebook->priv->drag_in_progress = FALSE;
notebook->priv->motion_notify_handler_id = 0;
- notebook->priv->src_notebook = NULL;
- notebook->priv->src_page = -1;
notebook->priv->focused_pages = NULL;
notebook->priv->opened_tabs = NULL;
notebook->priv->show_tabs = TRUE;