[metacity/cowbell] content area coordinates and area calculation

[Thomas James Alexander Thurman <tthurman src gnome org>]

commit 31f7041ff6c82b9068f15a095c495e5b3b35b9ba
Author: Thomas Thurman <tthurman gnome org>
Date:   Fri Oct 23 12:04:25 2009 -0400

    content area coordinates and area calculation

 src/ui/theme.c |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/src/ui/theme.c b/src/ui/theme.c
index b5c7df0..a74da3a 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -804,26 +804,44 @@ meta_theme_calc_geometry (MetaTheme              *theme,
   /* The width is simply the width of the content area, plus the edges
    * of the content area and frame. */
   fgeom->areas[CC_FRAME].width =
-    client_width +
+    fgeom->areas[CC_FRAME].left_edge +
     fgeom->areas[CC_CONTENT].left_edge +
+    client_width +
     fgeom->areas[CC_CONTENT].right_edge +
-    fgeom->areas[CC_FRAME].left_edge +
     fgeom->areas[CC_FRAME].right_edge;
   /* The height is the height of those elements, plus the height of the
    * title and its edges, and the edges of the titlebar area.
    */
   fgeom->areas[CC_FRAME].height =
-    client_height +
+    fgeom->areas[CC_FRAME].top_edge +
+    fgeom->areas[CC_TITLEBAR].top_edge +
+    fgeom->areas[CC_TITLE].top_edge +
+    text_height +
+    fgeom->areas[CC_TITLE].bottom_edge +
+    fgeom->areas[CC_TITLEBAR].bottom_edge +
     fgeom->areas[CC_CONTENT].top_edge +
+    client_height +
     fgeom->areas[CC_CONTENT].bottom_edge +
+    fgeom->areas[CC_FRAME].bottom_edge;
+
+  /* Next, the content area. */
+  fgeom->areas[CC_CONTENT].x = fgeom->areas[CC_FRAME].left_edge;
+  fgeom->areas[CC_CONTENT].y =
     fgeom->areas[CC_FRAME].top_edge +
-    fgeom->areas[CC_FRAME].bottom_edge +
-    text_height +
+    fgeom->areas[CC_TITLEBAR].top_edge +
     fgeom->areas[CC_TITLE].top_edge +
+    text_height +
     fgeom->areas[CC_TITLE].bottom_edge +
-    fgeom->areas[CC_TITLEBAR].top_edge +
     fgeom->areas[CC_TITLEBAR].bottom_edge;
-    
+  fgeom->areas[CC_CONTENT].width =
+    fgeom->areas[CC_CONTENT].left_edge +
+    client_width +
+    fgeom->areas[CC_CONTENT].right_edge;
+  fgeom->areas[CC_CONTENT].height =
+    fgeom->areas[CC_CONTENT].top_edge +
+    client_height +
+    fgeom->areas[CC_CONTENT].bottom_edge;
+
   /*
     Memo to self: identifiers are:
   CC_FRAME,