Skip to content
Extraits de code Groupes Projets
Valider 88b0320b rédigé par mattpiwik's avatar mattpiwik
Parcourir les fichiers

Thanks mattenschwinger Fixes #2392

git-svn-id: http://dev.piwik.org/svn/trunk@5234 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent 47d13f83
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -25,10 +25,10 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer ...@@ -25,10 +25,10 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer
{ {
private $reportFontStyle = ''; private $reportFontStyle = '';
private $reportSimpleFontSize = 9; private $reportSimpleFontSize = 9;
private $reportHeaderFontSize = 22; private $reportHeaderFontSize = 16;
private $cellHeight = 6; private $cellHeight = 6;
private $bottomMargin = 20; private $bottomMargin = 17;
private $reportWidthPortrait = 180; private $reportWidthPortrait = 195;
private $reportWidthLandscape = 270; private $reportWidthLandscape = 270;
private $minWidthLabelCell = 100; private $minWidthLabelCell = 100;
private $maxColumnCountPortraitOrientation = 6; private $maxColumnCountPortraitOrientation = 6;
...@@ -37,7 +37,7 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer ...@@ -37,7 +37,7 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer
private $totalWidth; private $totalWidth;
private $cellWidth; private $cellWidth;
private $labelCellWidth; private $labelCellWidth;
private $truncateAfter = 50; private $truncateAfter = 55;
private $leftSpacesBeforeLogo = 7; private $leftSpacesBeforeLogo = 7;
private $logoImagePosition = array(10, 40); private $logoImagePosition = array(10, 40);
private $headerTextColor; private $headerTextColor;
...@@ -325,10 +325,7 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer ...@@ -325,10 +325,7 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer
} }
// Computes available column width // Computes available column width
$this->totalWidth = $totalWidth; $this->totalWidth = $totalWidth;
$this->labelCellWidth = max(round(($this->totalWidth / $columnsCount) * 2), $this->minWidthLabelCell); $this->labelCellWidth = max(round(($this->totalWidth / $columnsCount) ), $this->minWidthLabelCell);
if ($columnsCount == 2) {
$this->labelCellWidth = $this->totalWidth / 2;
}
$this->cellWidth = round(($this->totalWidth - $this->labelCellWidth) / ($columnsCount - 1)); $this->cellWidth = round(($this->totalWidth - $this->labelCellWidth) / ($columnsCount - 1));
$this->totalWidth = $this->labelCellWidth + ($columnsCount - 1) * $this->cellWidth; $this->totalWidth = $this->labelCellWidth + ($columnsCount - 1) * $this->cellWidth;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter