projects
/
hildon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a new check of scrollbars layout in the allocation
[hildon]
/
hildon
/
hildon-pannable-area.c
diff --git
a/hildon/hildon-pannable-area.c
b/hildon/hildon-pannable-area.c
index
86342e4
..
abf5223
100644
(file)
--- a/
hildon/hildon-pannable-area.c
+++ b/
hildon/hildon-pannable-area.c
@@
-1223,6
+1223,8
@@
hildon_pannable_area_size_allocate (GtkWidget * widget,
if (child && GTK_WIDGET_VISIBLE (child)) {
if (child && GTK_WIDGET_VISIBLE (child)) {
+ hildon_pannable_area_check_scrollbars (HILDON_PANNABLE_AREA (widget));
+
hildon_pannable_area_child_allocate_calculate (widget,
allocation,
&child_allocation);
hildon_pannable_area_child_allocate_calculate (widget,
allocation,
&child_allocation);
@@
-1979,6
+1981,8
@@
hildon_pannable_area_button_press_cb (GtkWidget * widget,
(gpointer) & priv->child);
event = (GdkEventButton *) gdk_event_copy ((GdkEvent *) event);
(gpointer) & priv->child);
event = (GdkEventButton *) gdk_event_copy ((GdkEvent *) event);
+ /* remove the reference we added with the copy */
+ g_object_unref (priv->event_window);
event->x = x;
event->y = y;
priv->cx = x;
event->x = x;
event->y = y;
priv->cx = x;
@@
-2638,6
+2642,8
@@
hildon_pannable_area_motion_notify_cb (GtkWidget * widget,
if (priv->child) {
/* Send motion notify to child */
event = (GdkEventMotion *) gdk_event_copy ((GdkEvent *) event);
if (priv->child) {
/* Send motion notify to child */
event = (GdkEventMotion *) gdk_event_copy ((GdkEvent *) event);
+ /* remove the reference we added with the copy */
+ g_object_unref (priv->event_window);
event->x = priv->cx + (event->x - priv->ix);
event->y = priv->cy + (event->y - priv->iy);
event->window = g_object_ref (priv->child);
event->x = priv->cx + (event->x - priv->ix);
event->y = priv->cy + (event->y - priv->iy);
event->window = g_object_ref (priv->child);
@@
-2779,6
+2785,8
@@
hildon_pannable_area_button_release_cb (GtkWidget * widget,
event->x, event->y, &x, &y, GDK_BUTTON_RELEASE_MASK);
event = (GdkEventButton *) gdk_event_copy ((GdkEvent *) event);
event->x, event->y, &x, &y, GDK_BUTTON_RELEASE_MASK);
event = (GdkEventButton *) gdk_event_copy ((GdkEvent *) event);
+ /* remove the reference we added with the copy */
+ g_object_unref (priv->event_window);
event->x = x;
event->y = y;
event->x = x;
event->y = y;