diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index 71c739937..b7bc6a3ec 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -458,12 +458,21 @@ void EditorPanel::info_toggled () {
const rtengine::ImageMetaData* idata = ipc->getInitialImage()->getMetaData();
if (idata && idata->hasExif())
- infoString = Glib::ustring::compose ("%1 %2\nF/%3 %4 sec\n%5: %6\n%7: %8 mm\n",
- Glib::ustring(idata->getMake()), Glib::ustring(idata->getModel()),
- Glib::ustring(idata->apertureToString(idata->getFNumber())), Glib::ustring(idata->shutterToString(idata->getShutterSpeed())),
+// infoString = Glib::ustring::compose ("%1 %2\nF/%3 %4 sec\n%5: %6\n%7: %8 mm\n",
+// Glib::ustring(idata->getMake()), Glib::ustring(idata->getModel()),
+// Glib::ustring(idata->apertureToString(idata->getFNumber())), Glib::ustring(idata->shutterToString(idata->getShutterSpeed())),
+// M("QINFO_ISO"), idata->getISOSpeed(),
+// M("QINFO_FOCALLENGTH"), idata->getFocalLen())
+// + Glib::ustring::compose ("%1: %2", M("QINFO_LENS"), Glib::ustring(idata->getLens()));
+ infoString = Glib::ustring::compose (
+ "%1 + %2\n%3s f/%4 %5%6 f=%7mm",
+ Glib::ustring(idata->getModel()),
+ Glib::ustring(idata->getLens()),
+ Glib::ustring(idata->shutterToString(idata->getShutterSpeed())),
+ Glib::ustring(idata->apertureToString(idata->getFNumber())),
M("QINFO_ISO"), idata->getISOSpeed(),
- M("QINFO_FOCALLENGTH"), idata->getFocalLen())
- + Glib::ustring::compose ("%1: %2", M("QINFO_LENS"), Glib::ustring(idata->getLens()));
+ idata->getFocalLen()
+ );
else
infoString = M("QINFO_NOEXIF");
diff --git a/rtgui/imagearea.cc b/rtgui/imagearea.cc
index 6af40e42e..c1196e9b4 100644
--- a/rtgui/imagearea.cc
+++ b/rtgui/imagearea.cc
@@ -111,7 +111,8 @@ void ImageArea::setInfoText (Glib::ustring text) {
fontd.set_weight (Pango::WEIGHT_BOLD);
fontd.set_size (12*Pango::SCALE);
context->set_font_description (fontd);
- ilayout = create_pango_layout(text);
+ ilayout = create_pango_layout("");
+ ilayout->set_markup(text);
int iw, ih;
ilayout->get_pixel_size (iw, ih);
ipixbuf = Gdk::Pixbuf::create (Gdk::COLORSPACE_RGB, true, 8, iw+8, ih+8);