Merge branch 'dev' into newlocallab
This commit is contained in:
@@ -29,7 +29,6 @@
|
||||
ImageArea::ImageArea (ImageAreaPanel* p) : parent(p), fullImageWidth(0), fullImageHeight(0)
|
||||
{
|
||||
|
||||
infotext = "";
|
||||
cropgl = nullptr;
|
||||
pmlistener = nullptr;
|
||||
pmhlistener = nullptr;
|
||||
@@ -148,7 +147,7 @@ void ImageArea::on_style_updated ()
|
||||
void ImageArea::setInfoText (Glib::ustring text)
|
||||
{
|
||||
|
||||
infotext = text;
|
||||
infotext = std::move(text);
|
||||
|
||||
Glib::RefPtr<Pango::Context> context = get_pango_context () ;
|
||||
Pango::FontDescription fontd(get_style_context()->get_font());
|
||||
@@ -160,7 +159,7 @@ void ImageArea::setInfoText (Glib::ustring text)
|
||||
|
||||
// create text layout
|
||||
Glib::RefPtr<Pango::Layout> ilayout = create_pango_layout("");
|
||||
ilayout->set_markup(text);
|
||||
ilayout->set_markup(infotext);
|
||||
|
||||
// get size of the text block
|
||||
int iw, ih;
|
||||
|
Reference in New Issue
Block a user