ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Clean up AudioClock font API

Browse Source 
see also previous commit 2abf9c66a4
This commit is contained in:
Robin Gareus 2021-01-30 02:22:55 +01:00
parent 2abf9c66a4
commit 33088c728a
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk2_ardour/audio_clock.cc
View File

@ -173,39 +173,9 @@ AudioClock::on_realize ()
first_width = req.width;
first_height = req.height;
// XXX FIX ME: define font based on ... ???
// set_font ();
set_colors ();
}
void
AudioClock::set_font (Pango::FontDescription font)
{
Glib::RefPtr<Gtk::Style> style = get_style ();
Pango::AttrFontDesc* font_attr;
font_size = font.get_size();
font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
normal_attributes.change (*font_attr);
editing_attributes.change (*font_attr);
delete font_attr;
/* get the figure width for the font. This doesn't have to super
* accurate since we only use it to measure the (roughly 1 character)
* offset from the position Pango tells us for the "cursor"
*/
Glib::RefPtr<Pango::Layout> tmp = Pango::Layout::create (get_pango_context());
int ignore_height;
tmp->set_text ("8");
tmp->get_pixel_size (em_width, ignore_height);
/* force redraw of markup with new font-size */
AudioClock::set (last_when, true);
}
void
AudioClock::set_active_state (Gtkmm2ext::ActiveState s)
{
@ -2280,11 +2250,18 @@ AudioClock::on_style_changed (const Glib::RefPtr<Gtk::Style>& old_style)
{
CairoWidget::on_style_changed (old_style);
Glib::RefPtr<Gtk::Style> const& new_style = get_style ();
if (_layout && (_layout->get_font_description ().gobj () == 0 || _layout->get_font_description () != new_style->get_font ())) {
_layout->set_font_description (new_style->get_font ());
queue_resize ();
} else if (is_realized ()) {
queue_resize ();
}
Gtk::Requisition req;
set_clock_dimensions (req);
/* XXXX fix me ... we shouldn't be using GTK styles anyway */
// set_font ();
/* set-colors also sets up font-attributes */
set_colors ();
}

1
gtk2_ardour/audio_clock.h
View File

@ -256,7 +256,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
ARDOUR::samplecnt_t parse_as_seconds_distance (const std::string&);
ARDOUR::samplecnt_t parse_as_samples_distance (const std::string&);
void set_font (Pango::FontDescription);
void set_colors ();
void show_edit_status (int length);
int merge_input_and_edit_string ();