Normand Briere
2019-04-22 a9e12f6c508810604c8c91ee15451776b08ce1a1
timeflow/vis/timeline/AxisRenderer.java
....@@ -57,19 +57,23 @@
5757 g.setColor(t.unit.isDayOrLess() && (dayOfWeek == 1 || dayOfWeek == 7)
5858 ? new Color(245, 245, 245) : new Color(240, 240, 240));
5959
60
- g.fillRect(x0, y, x1 - x0 - 1, h);
60
+ g.fillRect(x0, y, x1 - x0, h);
6161 g.setColor(Color.white);
62
- g.drawLine(x1 - 1, y, x1 - 1, y + h);
62
+ g.drawLine(x1, y, x1, y + h);
6363 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));
6565
6666 g.setFont(model.getDisplay().timeLabel());
6767 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;
7074 g.setColor(full ? Color.darkGray : Color.gray);
7175 int sw = model.getDisplay().timeLabelFontMetrics().stringWidth(label);
72
- if (sw < x1 - tx - 3)
76
+ if (true) // sw < x1 - tx)
7377 {
7478 g.drawString(label, tx, ty);
7579 } else
....@@ -79,7 +83,7 @@
7983 {
8084 label = label.substring(0, c);
8185 sw = model.getDisplay().timeLabelFontMetrics().stringWidth(label);
82
- if (sw < x1 - tx - 3)
86
+ //if (sw < x1 - tx)
8387 {
8488 g.drawString(label, tx, ty);
8589 }