liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into newlocallab

Browse Source
This commit is contained in:
Ingo Weyrich
2019-08-08 16:18:58 +02:00
parent 3603cad472 82e329ca83
commit b3e0013e56
96 changed files with 1000 additions and 1654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/imagearea.cc
View File

@@ -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;