[maemo-commits] [maemo-commits] r18425 - in projects/haf/trunk/matchbox-window-manager/matchbox-window-manager: . src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-05-18 18:29:54 +0300 (Mon, 18 May 2009)
New Revision: 18425

Modified:
   projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/ChangeLog
   projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/src/dialog_client.c
   projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/src/wm.c
Log:
fix two layout bugs


Modified: projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/ChangeLog
===================================================================
--- projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/ChangeLog	2009-05-18 14:54:23 UTC (rev 18424)
+++ projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/ChangeLog	2009-05-18 15:29:54 UTC (rev 18425)
@@ -1,3 +1,14 @@
+2009-05-18  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox-window-manager/src/wm.c (wm_make_new_client): Remove
+	urgency flag from notifications.
+
+	* matchbox-window-manager/src/dialog_client.c (dialog_init_geometry):
+	Do not allow decorationless dialogs to position themselves freely. Use
+	'tthurman hack' for titleless dialogs as well. Fixes: NB#106529
+	(dialog_client_button_press): Do not hide dialog or allow dragging
+	when tapped on the title bar. Fixes: NB#103387
+
 2009-05-15  Thomas Thurman  <thomas.thurman at collabora.co.uk> 
 
 	* src/wm.c: all notifications have no titlebar.
@@ -7,7 +18,7 @@
 
         * src/dialog_client.c:
         Remove restrictions on urgent dialogs so that they get placed
-        and decorated.  Closes #106529.
+        and decorated.
         
 2009-04-22  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 

Modified: projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/src/dialog_client.c
===================================================================
--- projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/src/dialog_client.c	2009-05-18 14:54:23 UTC (rev 18424)
+++ projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/src/dialog_client.c	2009-05-18 15:29:54 UTC (rev 18425)
@@ -650,6 +650,7 @@
   if (w->config->dialog_stratergy == WM_DIALOGS_STRATERGY_FREE)
     return;
 
+#if 0
   /* Allow decorationless dialogs to position themselves anywhere 
    * But centered initially if 0,0 and a splash screen.
   */
@@ -665,6 +666,7 @@
 	}
       return;
     }
+#endif
 
   dialog_get_available_area(c,&avail_x, &avail_y, &avail_width, &avail_height);
 
@@ -747,7 +749,6 @@
 
   /* horiz contarined mode - force dialog to be full width*/
   /* but hacked by tthurman to happen in all modes */
-  if (!(c->flags & CLIENT_TITLE_HIDDEN_FLAG) )
     {
       c->x     = avail_x + bdr_west;
       c->width = avail_width - (bdr_east + bdr_west);
@@ -994,6 +995,7 @@
 	 break;
       case 0:
 	/* Not on button */
+#if 0
 	if (w->config->dialog_stratergy == WM_DIALOGS_STRATERGY_STATIC)
 	  {
 	    /* For static undraggble/stack fixed dialog we simply  
@@ -1028,6 +1030,7 @@
 	  }
 
 	dialog_client_drag(c); 
+#endif
 	break;
    }
 }

Modified: projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/src/wm.c
===================================================================
--- projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/src/wm.c	2009-05-18 14:54:23 UTC (rev 18424)
+++ projects/haf/trunk/matchbox-window-manager/matchbox-window-manager/src/wm.c	2009-05-18 15:29:54 UTC (rev 18425)
@@ -2076,8 +2076,12 @@
 		 {
 		   c = dialog_client_new(w, win, NULL);
 		   if (c == NULL) goto end;
+                   /* Fremantle: no urgency flag */
+                   /*
 		   c->flags |= CLIENT_HAS_URGENCY_FLAG |
 		     CLIENT_TITLE_HIDDEN_FLAG;
+                     */
+		   c->flags |= CLIENT_TITLE_HIDDEN_FLAG;
 		 }
 	       else if (value[0] == w->atoms[WINDOW_TYPE_NORMAL])
 		 {