From 9bd6e29d44704f5209fcd2fd892a820ea82f238e Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 7 Feb 2013 13:07:29 +0100
Subject: [PATCH] Fix problem with session zoom level in project Gantt view

If the zoom level was changed in other view inside a project, Gantt view didn't
notice it.

FEA: ItEr77S15FilteringEnhancements
---
 .../src/main/java/org/zkoss/ganttz/Planner.java   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index b95bd1f89..199249bd3 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -172,7 +172,7 @@ public class Planner extends HtmlMacroComponent  {
 
     private boolean isFlattenTree = false;
 
-    private ZoomLevel initialZoomLevel = null;
+    private ZoomLevel zoomLevel = null;
 
     private Listbox listZoomLevels = null;
 
@@ -274,7 +274,7 @@ public class Planner extends HtmlMacroComponent  {
         if (ganttPanel == null) {
             return;
         }
-        initialZoomLevel = zoomLevel;
+        this.zoomLevel = zoomLevel;
         ganttPanel.setZoomLevel(zoomLevel, scrollLeft);
     }
 
@@ -729,18 +729,14 @@ public class Planner extends HtmlMacroComponent  {
 
     public ZoomLevel getZoomLevel() {
         if (ganttPanel == null) {
-            return initialZoomLevel != null ? initialZoomLevel
+            return zoomLevel != null ? zoomLevel
                     : ZoomLevel.DETAIL_ONE;
         }
         return ganttPanel.getTimeTracker().getDetailLevel();
     }
 
     public void setInitialZoomLevel(final ZoomLevel zoomLevel) {
-        if (this.initialZoomLevel != null) {
-            // already initialized
-            return;
-        }
-        this.initialZoomLevel = zoomLevel;
+        this.zoomLevel = zoomLevel;
     }
 
     public boolean areContainersExpandedByDefault() {
@@ -814,8 +810,9 @@ public class Planner extends HtmlMacroComponent  {
     }
 
     public void updateSelectedZoomLevel() {
+        ganttPanel.getTimeTracker().setZoomLevel(zoomLevel);
         Listitem selectedItem = (Listitem) listZoomLevels.getItems().get(
-                initialZoomLevel.ordinal());
+                zoomLevel.ordinal());
         listZoomLevels.setSelectedItem(selectedItem);
         listZoomLevels.invalidate();
     }