[maemo-commits] [maemo-commits] r17408 - in projects/haf/trunk/libmatchbox2: . matchbox/core

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-02-12 14:34:59 +0200 (Thu, 12 Feb 2009)
New Revision: 17408

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.h
Log:
	* matchbox/core/mb-wm-decor.c
	* matchbox/core/mb-wm-decor.h:
	  Added signals for button pressed + released (to help hd-button
	  highlight correctly)
	* matchbox/core/mb-window-manager.h:
	  Fixed typo



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-02-12 11:08:10 UTC (rev 17407)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-02-12 12:34:59 UTC (rev 17408)
@@ -1,3 +1,12 @@
+2009-02-12  Gordon Williams  <gordon.williams at collabora.co.uk>
+	
+	* matchbox/core/mb-wm-decor.c
+	* matchbox/core/mb-wm-decor.h:
+	  Added signals for button pressed + released (to help hd-button
+	  highlight correctly)
+	* matchbox/core/mb-window-manager.h:
+	  Fixed typo
+
 2009-02-12  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Fixes for Coverity issues:

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h	2009-02-12 11:08:10 UTC (rev 17407)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h	2009-02-12 12:34:59 UTC (rev 17408)
@@ -30,7 +30,7 @@
  * window of a particular type; there is a subclass for each of these
  * types (such as MBWMClientDialog).  Each MBWindowManagerClient contains
  * an MBWMClientWindow which represents the actual low-level X window.
- 
+
  * MBWindowManager also contains an MBWMTheme, which is usually in
  * practice an instance of the subclass MBWMThemePng.
  *
@@ -66,7 +66,7 @@
 typedef enum
 {
   MBWindowManagerSignalThemeChange = 1,
-} MBWindowManagerSingal;
+} MBWindowManagerSignal;
 
 typedef enum
 {

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c	2009-02-12 11:08:10 UTC (rev 17407)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c	2009-02-12 12:34:59 UTC (rev 17408)
@@ -831,6 +831,8 @@
 	  mb_wm_theme_paint_button (wm->theme, button);
 	}
 
+      mb_wm_object_signal_emit(button, MBWMDecorButtonSignalPressed);
+
       if (button->press_activated)
 	{
 	  XUngrabPointer(wm->xdpy, CurrentTime);
@@ -884,7 +886,7 @@
 		   * the events here.
 		   */
 		  if (!button->realized) {
-		    mb_wm_object_unref (MB_WM_OBJECT(button)); 
+		    mb_wm_object_unref (MB_WM_OBJECT(button));
 		    return False;
 		  }
 
@@ -956,6 +958,9 @@
 				goto done;
 			      }
 
+			    mb_wm_object_signal_emit(button,
+			        MBWMDecorButtonSignalReleased);
+
 			    if (button->release)
 			      button->release(wm, button, button->userdata);
 			    else
@@ -1106,7 +1111,7 @@
    * We are doing the job in the mb_wm_decor_button_unrealize() while the
    * decoration still exists.
    */
-  
+
 }
 
 static void
@@ -1152,7 +1157,7 @@
       button->themedata = NULL;
       button->destroy_themedata = NULL;
     }
-  
+
   button->realized = False;
 }
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.h	2009-02-12 11:08:10 UTC (rev 17407)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.h	2009-02-12 12:34:59 UTC (rev 17408)
@@ -212,6 +212,12 @@
   */
 };
 
+typedef enum
+{
+  MBWMDecorButtonSignalPressed = 1,
+  MBWMDecorButtonSignalReleased = 2,
+} MBWMDecorButtonSignal;
+
 int
 mb_wm_decor_button_class_type (void);