From a994173bb8dcdbb4fb9c6ae93ff54f2e92f6039b Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Wed, 8 Jul 2009 16:45:17 +0200 Subject: [PATCH] ItEr16S09RFComportamentoGraficoPlanificadorItEr15S12: Timetracker scrollX with adjusted properly when changing zoom levels. --- .../src/main/resources/web/js/ganttz/tasklist.js | 7 +++---- .../src/main/webapp/planner/css/ganttzk.css | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js index 3198b781e..7c11079b4 100644 --- a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js +++ b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js @@ -110,6 +110,7 @@ function adjustScrollableDimensions() { // Timetracker is recalculated when the window is resized and when zoom // level is changed as the component is recreated timetracker = document.getElementById('timetracker'); + watermark = document.getElementById('watermark'); scroll_container = document.getElementById('scroll_container'); timetracker.style["width"] = @@ -130,8 +131,6 @@ function adjustScrollableDimensions() { = document.getElementById('listdetails_container').scrollHeight + "px"; // Inner divs need recalculation to adjust to new scroll displacement lenght -/* It must be recalculated matching taskdetails width - * document.getElementById('ganttpanel_inner_scroller_x').style["width"] - = timetracker.firstElementChild.clientWidth +"px"; */ - + document.getElementById('ganttpanel_inner_scroller_x').style["width"] + = watermark.offsetWidth +"px"; } \ No newline at end of file diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css index 9083a9103..44b05d8b9 100644 --- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css +++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css @@ -109,7 +109,7 @@ border:0px; border-bottom: dotted 1px #CCCCCC; margin-bottom: 10px; margin-top: 10px; - width: 1800px; + width: 10000px; /* Defined to be larger than the maximum scroll_inner_x */ } /* -------------- TaskGroup -------------- */ @@ -286,7 +286,7 @@ tr.z-vbox-sep { #ganttpanel_inner_scroller_x { /* must be resized on ganttpanel javascript adjust size */ - width:1900px; /* Real canvas dimensions */ + width:9000px; /* Real canvas dimensions */ height:15px; /* Scroll constant */ }