tab index

Normand Briere

2019-09-30 3966454055db8e04700e881a091c2d33dcfda232

 timeflow/vis/timeline/AxisRenderer.java
..
..
@@ -57,19 +57,23 @@
57
57
                         g.setColor(t.unit.isDayOrLess() && (dayOfWeek == 1 || dayOfWeek == 7)
58
58
                                 ? new Color(245, 245, 245) : new Color(240, 240, 240));
59
59
 
60
-                        g.fillRect(x0, y, x1 - x0 - 1, h);
60
+                        g.fillRect(x0, y, x1 - x0, h);
61
61
                         g.setColor(Color.white);
62
-                        g.drawLine(x1 - 1, y, x1 - 1, y + h);
62
+                        g.drawLine(x1, y, x1, y + h);
63
63
                         g.drawLine(x0, y + h, x1, y + h);
64
-                        objectLocations.add(new Mouseover(new Interval(start, end), x0, y, x1 - x0 - 1, h));
64
+                        objectLocations.add(new Mouseover(new Interval(start, end), x0, y, x1 - x0, h));
65
65
 
66
66
                         g.setFont(model.getDisplay().timeLabel());
67
67
                         String label = full ? t.unit.formatFull(start) : t.unit.format(new Date(start));
68
-                        int tx = x0 + 3;
69
-                        int ty = y + h - 5;
68
+                        
69
+                        if (!full)
70
+                                full = false;
71
+                        
72
+                        int tx = x0;
73
+                        int ty = y + h;
70
74
                         g.setColor(full ? Color.darkGray : Color.gray);
71
75
                         int sw = model.getDisplay().timeLabelFontMetrics().stringWidth(label);
72
-                        if (sw < x1 - tx - 3)
76
+                        if (true) // sw < x1 - tx)
73
77
                         {
74
78
                                 g.drawString(label, tx, ty);
75
79
                         } else
..
..
@@ -79,7 +83,7 @@
79
83
                                 {
80
84
                                         label = label.substring(0, c);
81
85
                                         sw = model.getDisplay().timeLabelFontMetrics().stringWidth(label);
82
-                                        if (sw < x1 - tx - 3)
86
+                                        //if (sw < x1 - tx)
83
87
                                         {
84
88
                                                 g.drawString(label, tx, ty);
85
89
                                         }