Changeset 115 in tmcsimulator-scriptbuilder for trunk


Ignore:
Timestamp:
09/07/2017 01:34:49 PM (9 years ago)
Author:
bmcguffin
Message:

Fixed a bug that prevented more time from being added to the end of the incidentEditorFrame window if the incident was less than 14 minutes long.

Location:
trunk/src/scriptbuilder/gui/panels
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java

    r98 r115  
    103103                    ? ScriptBuilderGuiConstants.TIMELINE_OPENED_HEIGHT 
    104104                    : ScriptBuilderGuiConstants.TIMELINE_OPENED_HEIGHT; 
    105             if ((incident.length + incident.offset) > longestLength) 
     105            if ((incident.length + incident.offset + timeline.requestedEditorFillerTime) > longestLength) 
    106106            { 
    107107                longestLength = incident.length + incident.offset + timeline.requestedEditorFillerTime; 

  • trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java

    r98 r115  
    153153                    ? ScriptBuilderGuiConstants.TIMELINE_OPENED_HEIGHT 
    154154                    : ScriptBuilderGuiConstants.TIMELINE_OPENED_HEIGHT; 
    155             if ((incident.length + incident.offset) > longestLength) 
     155            if ((incident.length + incident.offset + timeline.requestedEditorFillerTime) > longestLength) 
    156156            { 
    157157                longestLength = incident.length + incident.offset + timeline.requestedEditorFillerTime; 
Note: See TracChangeset for help on using the changeset viewer.