AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Check start_button_mask before starting a drag. (#149058, Andreas Volz)

Browse Source 
2005-06-12  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row):
	Check start_button_mask before starting a drag.  (#149058,
	Andreas Volz)
This commit is contained in:
Matthias Clasen 2005-06-12 05:13:54 +00:00 committed by Matthias Clasen
parent 7c631d5cb0
commit 793591fcf0
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2005-06-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row):
Check start_button_mask before starting a drag. (#149058,
Andreas Volz)
* gtk/gtkfilesystemunix.c: Support .hidden files. (#129170,
Sayamindu Dasgupta, patch by Jan Arne Petersen)

4
ChangeLog.pre-2-10
View File

@ -1,5 +1,9 @@
2005-06-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row):
Check start_button_mask before starting a drag. (#149058,
Andreas Volz)
* gtk/gtkfilesystemunix.c: Support .hidden files. (#129170,
Sayamindu Dasgupta, patch by Jan Arne Petersen)

4
ChangeLog.pre-2-8
View File

@ -1,5 +1,9 @@
2005-06-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row):
Check start_button_mask before starting a drag. (#149058,
Andreas Volz)
* gtk/gtkfilesystemunix.c: Support .hidden files. (#129170,
Sayamindu Dasgupta, patch by Jan Arne Petersen)

8
gtk/gtktreeview.c
View File

@ -3236,15 +3236,12 @@ gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view)
/* see if we are near the edge. */
offset = y - (visible_rect.y + 2 * SCROLL_EDGE_SIZE);
g_print ("offset1 %d\n", offset);
if (offset > 0)
{
offset = y - (visible_rect.y + visible_rect.height - 2 * SCROLL_EDGE_SIZE);
g_print ("offset2 %d\n", offset);
if (offset < 0)
return;
}
g_print ("offset3 %d\n", offset);
value = CLAMP (tree_view->priv->vadjustment->value + offset, 0.0,
tree_view->priv->vadjustment->upper - tree_view->priv->vadjustment->page_size);
@ -5933,9 +5930,8 @@ gtk_tree_view_maybe_begin_dragging_row (GtkTreeView *tree_view,
path))
goto out;
/* FIXME Check whether we're a start button, if not return FALSE and
* free path
*/
if (!(GDK_BUTTON1_MASK << (button - 1) & di->start_button_mask))
goto out;
/* Now we can begin the drag */