[maemo-commits] [maemo-commits] r13345 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-22 17:11:30 +0300 (Wed, 22 Aug 2007)
New Revision: 13345

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c
Log:
2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>

	* libhildondesktop/hildon-desktop-popup-window.c
	(hildon_desktop_popup_window_composited_button_release): fixed wrong
	behavior when clicking outside extra pane window. Check if the window
	is visible when handling button releases. Fixes NB#65177.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-22 13:42:03 UTC (rev 13344)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-22 14:11:30 UTC (rev 13345)
@@ -1,5 +1,12 @@
 2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* libhildondesktop/hildon-desktop-popup-window.c
+	(hildon_desktop_popup_window_composited_button_release): fixed wrong
+	behavior when clicking outside extra pane window. Check if the window
+	is visible when handling button releases. Fixes NB#65177.
+
+2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* libhildondesktop/hildon-desktop-popup-menu.c
 	(hildon_desktop_popup_menu_init): do not allow focus on scrolling
 	buttons in order to avoid them to steal the focus from menu items.
@@ -8,7 +15,7 @@
 2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* libhildondesktop/hildon-desktop-popup-window.c
-	(hildon_desktop_popup_window_button_release_event): fix wrong behavior
+	(hildon_desktop_popup_window_button_release_event): fixed wrong behavior
 	when clicking outside the popup window.
 	* libhildondesktop/hildon-desktop-popup-menu.c
 	(hildon_desktop_popup_menu_init,

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2007-08-22 13:42:03 UTC (rev 13344)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2007-08-22 14:11:30 UTC (rev 13345)
@@ -753,8 +753,11 @@
      }
   }
 
+  if (!GTK_WIDGET_VISIBLE (widget))
+    in_panes_area = FALSE; 
+
   /* Event outside of popup or in button area, close in clean way */
-  if (!in_panes_area || in_window_area)
+  if (!in_panes_area && !in_window_area)
   {	  
     hildon_desktop_popup_window_popdown (popup);
 #if defined(MAEMO_CHANGES) && defined(HAVE_XTEST)    
@@ -1095,11 +1098,11 @@
   {
     if (pane <= -1)
     { 
-      if (popup->priv->have_xgrab)	    
+      if (popup->priv->have_xgrab)
         return;
       else
       { 
-        gtk_grab_remove (popup->priv->pane_with_grab);	      
+        gtk_grab_remove (popup->priv->pane_with_grab);
 
 	popup_grab_on_window (GTK_WIDGET (popup)->window, GDK_CURRENT_TIME, TRUE);