Separate dimensions for compact version of boxes from detailed version

5 files changed, 19 insertions, 19 deletions

diff --git a/library/WT/Controller/Ancestry.php b/library/WT/Controller/Ancestry.php
index 53a3ef4d6c..35fc6b3656 100644
--- a/library/WT/Controller/Ancestry.php
+++ b/library/WT/Controller/Ancestry.php
@@ -43,7 +43,7 @@ class WT_Controller_Ancestry extends WT_Controller_Chart {
 	var $cellwidth;
 
 	function __construct() {
-		global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bwidth, $bheight, $pbwidth, $pbheight, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS;
+		global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bwidth, $bheight, $cbwidth, $cbheight, $pbwidth, $pbheight, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS;
 		global $DEFAULT_PEDIGREE_GENERATIONS, $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $OLD_PGENS, $box_width, $Dbwidth, $Dbheight;
 		global $show_full;
 
@@ -67,10 +67,10 @@ class WT_Controller_Ancestry extends WT_Controller_Chart {
 		$bwidth=$Dbwidth;
 		$bheight=$Dbheight;
 		
-		// -- adjust size of the non-detailed boxes
+		// -- adjust size of the compact box
 		if (!$this->show_full) {
-			$bwidth = $bwidth - 25;
-			$bheight = $bheight - 32;
+			$bwidth = $cbwidth;
+			$bheight = $cbheight;
 		}
 
 		$pbwidth = $bwidth+12;
diff --git a/library/WT/Controller/Descendancy.php b/library/WT/Controller/Descendancy.php
index 9bb27c5ebf..19d93cf82e 100644
--- a/library/WT/Controller/Descendancy.php
+++ b/library/WT/Controller/Descendancy.php
@@ -56,7 +56,7 @@ class WT_Controller_Descendancy extends WT_Controller_Chart {
 	var $show_cousins;
 
 	function __construct() {
-		global $USE_RIN, $MAX_ALIVE_AGE, $bwidth, $bheight, $pbwidth, $pbheight, $GEDCOM, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS, $DEFAULT_PEDIGREE_GENERATIONS, $show_full;
+		global $USE_RIN, $MAX_ALIVE_AGE, $bwidth, $bheight, $cbwidth, $cbheight, $pbwidth, $pbheight, $GEDCOM, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS, $DEFAULT_PEDIGREE_GENERATIONS, $show_full;
 
 		parent::__construct();
 
@@ -78,10 +78,10 @@ class WT_Controller_Descendancy extends WT_Controller_Chart {
 		$bwidth=$Dbwidth;
 		$bheight=$Dbheight;
 		
-		// -- adjust size of the non-detailed boxes
+		// -- adjust size of the compact box
 		if (!$this->show_full) {
-			$bwidth = $bwidth - 25;
-			$bheight = $bheight - 32;
+			$bwidth = $cbwidth;
+			$bheight = $cbheight;
 		}
 		
 		$pbwidth = $bwidth+12;
diff --git a/library/WT/Controller/Familybook.php b/library/WT/Controller/Familybook.php
index 29834f86e8..dd892670d5 100644
--- a/library/WT/Controller/Familybook.php
+++ b/library/WT/Controller/Familybook.php
@@ -55,16 +55,16 @@ class WT_Controller_Familybook extends WT_Controller_Chart {
 		$this->box_width  =safe_GET_integer('box_width',     50, 300, 100);
 
 		// Box sizes are set globally in the theme.  Modify them here.
-		global $bwidth, $bheight, $Dbwidth, $Dbheight;
+		global $bwidth, $bheight, $cbwidth, $cbheight, $Dbwidth, $Dbheight;
 		$Dbwidth =$this->box_width * $bwidth  / 100;
 		$Dbheight=$this->box_width * $bheight / 100;
 		$bwidth  =$Dbwidth;
 		$bheight =$Dbheight;
 		
-		// -- adjust size of the non-detailed boxes
+		// -- adjust size of the compact box
 		if (!$this->show_full) {
-			$bwidth = $bwidth - 25;
-			$bheight = $bheight - 32;
+			$bwidth = $cbwidth;
+			$bheight = $cbheight;
 		}
 
 		if ($this->root && $this->root->canDisplayName()) {
diff --git a/library/WT/Controller/Hourglass.php b/library/WT/Controller/Hourglass.php
index f545c18d06..4e3173577a 100644
--- a/library/WT/Controller/Hourglass.php
+++ b/library/WT/Controller/Hourglass.php
@@ -62,7 +62,7 @@ class WT_Controller_Hourglass extends WT_Controller_Chart {
 	var $arrheight;
 
 	function __construct($rootid='', $show_full=1, $generations=3) {
-		global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bheight, $bwidth, $bhalfheight, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS;
+		global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bheight, $bwidth, $cbwidth, $cbheight, $bhalfheight, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS;
 		global $WT_IMAGES, $TEXT_DIRECTION, $show_full;
 
 		parent::__construct();
@@ -99,10 +99,10 @@ class WT_Controller_Hourglass extends WT_Controller_Chart {
 		$bwidth=$Dbwidth;
 		$bheight=$Dbheight;
 		
-		// -- adjust size of the non-detailed boxes
+		// -- adjust size of the compact box
 		if (!$this->show_full) {
-			$bwidth = $bwidth - 25;
-			$bheight = $bheight - 32;
+			$bwidth = $cbwidth;
+			$bheight = $cbheight;
 		}
 
 		$bhalfheight = (int)($bheight / 2);
diff --git a/library/WT/Controller/Pedigree.php b/library/WT/Controller/Pedigree.php
index fe3ea5b7ba..9ea2759493 100644
--- a/library/WT/Controller/Pedigree.php
+++ b/library/WT/Controller/Pedigree.php
@@ -52,7 +52,7 @@ class WT_Controller_Pedigree extends WT_Controller_Chart {
 	public function __construct() {
 		global $PEDIGREE_FULL_DETAILS, $PEDIGREE_LAYOUT, $MAX_PEDIGREE_GENERATIONS;
 		global $DEFAULT_PEDIGREE_GENERATIONS, $SHOW_EMPTY_BOXES;
-		global $bwidth, $bheight, $baseyoffset, $basexoffset, $byspacing, $bxspacing;
+		global $bwidth, $bheight, $cbwidth, $cbheight, $baseyoffset, $basexoffset, $byspacing, $bxspacing;
 		global $BROWSER_TYPE, $show_full, $talloffset;
 
 		parent::__construct();
@@ -92,8 +92,8 @@ class WT_Controller_Pedigree extends WT_Controller_Chart {
 
 		// -- adjust size of the compact box
 		if (!$this->show_full) {
-			$bwidth = $bwidth - 25;
-			$bheight = $bheight - 32;
+			$bwidth = $cbwidth;
+			$bheight = $cbheight;
 		}
 		//-- adjustments for portrait mode
 		if ($this->talloffset==0) {