Merge pull request #4673 from Beep6581/thumbtooltip

Always show filename in the thumb tooltip, #4672
This commit is contained in:
Beep6581
2018-07-19 19:28:21 +02:00
committed by GitHub

View File

@@ -742,16 +742,19 @@ Glib::ustring ThumbBrowserEntryBase::getToolTip (int x, int y)
tooltip = buttonSet->getToolTip (x, y); tooltip = buttonSet->getToolTip (x, y);
} }
// if the fileinfo is not shown anyway, make a tooltip with the info // Always show the filename in the tooltip since the filename in the thumbnail could be truncated.
if (withFilename < WFNAME_FULL && inside(x, y) && tooltip.empty()) { // If "Show Exif info" is disabled, also show Exif info in the tooltip.
if (inside(x, y) && tooltip.empty()) {
tooltip = dispname; tooltip = dispname;
if (options.fbShowDateTime && datetimeline != "") { if (withFilename < WFNAME_FULL) {
tooltip += Glib::ustring("\n") + datetimeline; if (options.fbShowDateTime && datetimeline != "") {
} tooltip += Glib::ustring("\n") + datetimeline;
}
if (options.fbShowBasicExif && exifline != "") { if (options.fbShowBasicExif && exifline != "") {
tooltip += Glib::ustring("\n") + exifline; tooltip += Glib::ustring("\n") + exifline;
}
} }
} }