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

canvas text: generalize ::font_size_for_height() to handle different font families

This commit is contained in:
Paul Davis 2021-10-19 10:54:27 -06:00
parent ccc1fd8a2d
commit 211b3ea668
2 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/canvas/canvas/text.h
View File

@ -61,8 +61,10 @@ public:
double text_width() const;
double text_height() const;
static int font_size_for_height (Distance height, Glib::RefPtr<Pango::Context> const &);
typedef std::map<Distance,int> FontSizeMap;
void set_height_based_on_allocation (bool yn);
static int font_size_for_height (Distance height, std::string const & font_family, Glib::RefPtr<Pango::Context> const &);
static void drop_height_maps ();
private:
std::string _text;
@ -76,11 +78,14 @@ private:
mutable bool _need_redraw;
mutable double _width_correction;
double _clamped_width;
std::string _font_family;
bool _height_based_on_allocation;
void _redraw () const;
static FontSizeMap font_size_map;
typedef std::map<Distance,int> FontSizeMap;
typedef std::map<std::string,FontSizeMap> FontSizeMaps;
static FontSizeMaps font_size_maps;
};
}

47
libs/canvas/text.cc
View File

@ -33,7 +33,7 @@
using namespace std;
using namespace ArdourCanvas;
Text::FontSizeMap Text::font_size_map;
Text::FontSizeMaps Text::font_size_maps;
Text::Text (Canvas* c)
: Item (c)
@ -45,6 +45,7 @@ Text::Text (Canvas* c)
, _need_redraw (false)
, _width_correction (-1)
, _clamped_width (COORD_MAX)
, _height_based_on_allocation (false)
{
_outline = false;
}
@ -59,6 +60,7 @@ Text::Text (Item* parent)
, _need_redraw (false)
, _width_correction (-1)
, _clamped_width (COORD_MAX)
, _height_based_on_allocation (false)
{
_outline = false;
}
@ -68,6 +70,16 @@ Text::~Text ()
delete _font_description;
}
void
Text::set_height_based_on_allocation (bool yn)
{
/* assumed to be set during construction, so we do not schedule a
* redraw after changing this.
*/
_height_based_on_allocation = yn;
}
void
Text::set (string const & text)
{
@ -349,7 +361,12 @@ Text::_size_allocate (Rect const & r)
return;
}
int font_size = font_size_for_height (r.height(), _canvas->get_pango_context());
if (!_height_based_on_allocation) {
/* non-resizable text */
return;
}
int font_size = font_size_for_height (r.height(), _font_description->get_family(), _canvas->get_pango_context());
if (font_size) {
char font_name[32];
@ -357,19 +374,27 @@ Text::_size_allocate (Rect const & r)
snprintf (font_name, sizeof (font_name), "%s %d", family.c_str(), font_size);
Pango::FontDescription pfd (font_name);
set_font_description (pfd);
show ();
} else {
hide ();
}
}
int
Text::font_size_for_height (Distance height, Glib::RefPtr<Pango::Context> const & ctxt)
Text::font_size_for_height (Distance height, std::string const & font_family, Glib::RefPtr<Pango::Context> const & ctxt)
{
FontSizeMap::iterator fsm = font_size_map.find (height);
FontSizeMaps::iterator fsM = font_size_maps.find (font_family); /* map of maps */
if (fsm != font_size_map.end()) {
if (fsM == font_size_maps.end()) {
fsM = font_size_maps.insert (make_pair (font_family, FontSizeMap())).first;
}
FontSizeMap::iterator fsm = fsM->second.find (height); /* map of point size -> pixel height */
if (fsm != fsM->second.end()) {
return fsm->second;
}
std::string family = "Sans"; // UIConfiguration::instance().get_ui_font_family();
Glib::RefPtr<Pango::Layout> l (Pango::Layout::create (ctxt));
int font_size = 0;
char font_name[32];
@ -382,7 +407,7 @@ Text::font_size_for_height (Distance height, Glib::RefPtr<Pango::Context> const
for (uint32_t pt = 5; pt < 24; ++pt) {
snprintf (font_name, sizeof (font_name), "%s %d", family.c_str(), pt);
snprintf (font_name, sizeof (font_name), "%s %d", font_family.c_str(), pt);
Pango::FontDescription pfd (font_name);
l->set_font_description (pfd);
@ -395,8 +420,14 @@ Text::font_size_for_height (Distance height, Glib::RefPtr<Pango::Context> const
}
if (font_size) {
font_size_map[height] = font_size;
fsM->second.insert (make_pair (height, font_size));
}
return font_size;
}
void
Text::drop_height_maps ()
{
font_size_maps.clear ();
}