comparison layer/TimeInstantLayer.cpp @ 1148:c0d841cb8ab9 tony-2.0-integration

Merge latest SV 3.0 branch code
author Chris Cannam
date Fri, 19 Aug 2016 15:58:57 +0100
parents ee01a4062747
children a34a2a25907c
comparison
equal deleted inserted replaced
1009:96cf499fad62 1148:c0d841cb8ab9
18 #include "data/model/Model.h" 18 #include "data/model/Model.h"
19 #include "base/RealTime.h" 19 #include "base/RealTime.h"
20 #include "view/View.h" 20 #include "view/View.h"
21 #include "base/Profiler.h" 21 #include "base/Profiler.h"
22 #include "base/Clipboard.h" 22 #include "base/Clipboard.h"
23
23 #include "ColourDatabase.h" 24 #include "ColourDatabase.h"
25 #include "PaintAssistant.h"
24 26
25 #include "data/model/SparseOneDimensionalModel.h" 27 #include "data/model/SparseOneDimensionalModel.h"
26 28
27 #include "widgets/ItemEditDialog.h" 29 #include "widgets/ItemEditDialog.h"
28 #include "widgets/ListInputDialog.h" 30 #include "widgets/ListInputDialog.h"
454 int nx = v->getXForFrame(j->frame); 456 int nx = v->getXForFrame(j->frame);
455 if (nx >= x && nx - x - iw - 3 <= lw) good = false; 457 if (nx >= x && nx - x - iw - 3 <= lw) good = false;
456 } 458 }
457 459
458 if (good) { 460 if (good) {
459 v->drawVisibleText(paint, x + iw + 2, textY, p.label, View::OutlinedText); 461 PaintAssistant::drawVisibleText(v, paint, x + iw + 2, textY, p.label, PaintAssistant::OutlinedText);
460 // paint.drawText(x + iw + 2, textY, p.label); 462 // paint.drawText(x + iw + 2, textY, p.label);
461 } 463 }
462 } 464 }
463 465
464 prevX = x; 466 prevX = x;