From: Go MAEDA Date: Fri, 20 Mar 2020 04:52:34 +0000 (+0000) Subject: Merged r19592 from trunk to 4.1-stable (#23645). X-Git-Tag: 4.1.1~23 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a9df0ad98a94abc876869d3e593b67b5bf2b3ace;p=redmine.git Merged r19592 from trunk to 4.1-stable (#23645). git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19593 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index f9040d335..0694ab83d 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -945,21 +945,24 @@ module Redmine height /= 2 if markers # Renders the task bar, with progress and late if coords[:bar_start] && coords[:bar_end] + width = [1, coords[:bar_end] - coords[:bar_start]].max params[:pdf].SetY(params[:top] + 1.5) params[:pdf].SetX(params[:subject_width] + coords[:bar_start]) params[:pdf].SetFillColor(200, 200, 200) - params[:pdf].RDMCell(coords[:bar_end] - coords[:bar_start], height, "", 0, 0, "", 1) + params[:pdf].RDMCell(width, height, "", 0, 0, "", 1) if coords[:bar_late_end] + width = [1, coords[:bar_late_end] - coords[:bar_start]].max params[:pdf].SetY(params[:top] + 1.5) params[:pdf].SetX(params[:subject_width] + coords[:bar_start]) params[:pdf].SetFillColor(255, 100, 100) - params[:pdf].RDMCell(coords[:bar_late_end] - coords[:bar_start], height, "", 0, 0, "", 1) + params[:pdf].RDMCell(width, height, "", 0, 0, "", 1) end if coords[:bar_progress_end] + width = [1, coords[:bar_progress_end] - coords[:bar_start]].max params[:pdf].SetY(params[:top] + 1.5) params[:pdf].SetX(params[:subject_width] + coords[:bar_start]) params[:pdf].SetFillColor(90, 200, 90) - params[:pdf].RDMCell(coords[:bar_progress_end] - coords[:bar_start], height, "", 0, 0, "", 1) + params[:pdf].RDMCell(width, height, "", 0, 0, "", 1) end end # Renders the markers