allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

add option for a minor/micro tick font description to ArdourCanvas::Ruler

Browse Source
This commit is contained in:
Paul Davis
2025-05-19 14:55:55 -06:00
parent ba7e63f570
commit 4a6716e39c
2 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/canvas/canvas/ruler.h
View File

@@ -61,12 +61,11 @@ public:
Ruler (Item*, const Metric* m);
Ruler (Item*, const Metric* m, Rect const&);
virtual ~Ruler () {
delete _font_description;
}
virtual ~Ruler ();
void set_range (int64_t lower, int64_t upper);
void set_font_description (Pango::FontDescription);
void set_minor_font_description (Pango::FontDescription);
void set_metric (const Metric *);
void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
@@ -85,6 +84,7 @@ private:
Gtkmm2ext::Color _divider_color_bottom;
Pango::FontDescription* _font_description;
Pango::FontDescription* _minor_font_description;
mutable std::vector<Mark> marks;
mutable bool _need_marks;
};

44
libs/canvas/ruler.cc
View File

@@ -37,7 +37,8 @@ Ruler::Ruler (Canvas* c, const Metric* m)
, _lower (0)
, _upper (0)
, _divide_height (-1.0)
, _font_description (0)
, _font_description (nullptr)
, _minor_font_description (nullptr)
, _need_marks (true)
{
}
@@ -48,7 +49,8 @@ Ruler::Ruler (Canvas* c, const Metric* m, Rect const& r)
, _lower (0)
, _upper (0)
, _divide_height (-1.0)
, _font_description (0)
, _font_description (nullptr)
, _minor_font_description (nullptr)
, _need_marks (true)
{
}
@@ -59,7 +61,8 @@ Ruler::Ruler (Item* parent, const Metric* m)
, _lower (0)
, _upper (0)
, _divide_height (-1.0)
, _font_description (0)
, _font_description (nullptr)
, _minor_font_description (nullptr)
, _need_marks (true)
{
}
@@ -70,11 +73,18 @@ Ruler::Ruler (Item* parent, const Metric* m, Rect const& r)
, _lower (0)
, _upper (0)
, _divide_height (-1.0)
, _font_description (0)
, _font_description (nullptr)
, _minor_font_description (nullptr)
, _need_marks (true)
{
}
Ruler::~Ruler()
{
delete _font_description;
delete _minor_font_description;
}
void
Ruler::set_range (int64_t l, int64_t u)
{
@@ -94,6 +104,15 @@ Ruler::set_font_description (Pango::FontDescription fd)
end_visual_change ();
}
void
Ruler::set_minor_font_description (Pango::FontDescription fd)
{
begin_visual_change ();
delete _minor_font_description;
_minor_font_description = new Pango::FontDescription (fd);
end_visual_change ();
}
void
Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
{
@@ -148,12 +167,25 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (cr);
Pango::FontDescription* last_font_description = 0;
Pango::FontDescription* last_font_description = nullptr;
Coord prev = -1;
for (vector<Mark>::const_iterator m = marks.begin(); m != marks.end(); ++m) {
Duple pos;
Pango::FontDescription* fd = _font_description;
Pango::FontDescription* fd;
switch (m->style) {
case Mark::Major:
fd = _font_description;
break;
default:
if (_minor_font_description) {
fd = _minor_font_description;
} else {
fd = _font_description;
}
break;
}
pos.x = round (m->position/_metric->units_per_pixel) + self.x0;
pos.y = self.y1; /* bottom edge */