[Scummvm-git-logs] scummvm master -> c84a78b7785e0cac1212e97ef7fb229fe5f212f5

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c84a78b778 GUI: Make Tooltip padding configurable and scalable


Commit: c84a78b7785e0cac1212e97ef7fb229fe5f212f5
    https://github.com/scummvm/scummvm/commit/c84a78b7785e0cac1212e97ef7fb229fe5f212f5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-20T19:03:09+02:00

Commit Message:
GUI: Make Tooltip padding configurable and scalable

Changed paths:
    gui/Tooltip.cpp
    gui/Tooltip.h
    gui/themes/scummremastered.zip
    gui/themes/scummremastered/remastered_layout.stx
    gui/themes/scummremastered/remastered_layout_lowres.stx


diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp
index 145a5b364c..20f74e1cd0 100644
--- a/gui/Tooltip.cpp
+++ b/gui/Tooltip.cpp
@@ -45,15 +45,17 @@ void Tooltip::setup(Dialog *parent, Widget *widget, int x, int y) {
 	_maxWidth = g_gui.xmlEval()->getVar("Globals.Tooltip.MaxWidth", 100);
 	_xdelta = g_gui.xmlEval()->getVar("Globals.Tooltip.XDelta", 0);
 	_ydelta = g_gui.xmlEval()->getVar("Globals.Tooltip.YDelta", 0);
+	_xpadding = g_gui.xmlEval()->getVar("Globals.Tooltip.XPadding", 2);
+	_ypadding = g_gui.xmlEval()->getVar("Globals.Tooltip.YPadding", 2);
 
 	const Graphics::Font *tooltipFont = g_gui.theme()->getFont(ThemeEngine::kFontStyleTooltip);
 
 	_wrappedLines.clear();
-	_w = tooltipFont->wordWrapText(widget->getTooltip(), _maxWidth - 4, _wrappedLines) + 4;
-	_h = (tooltipFont->getFontHeight() + 2) * _wrappedLines.size() + 4;
+	_w = tooltipFont->wordWrapText(widget->getTooltip(), _maxWidth - _xpadding * 2, _wrappedLines) + _xpadding * 2;
+	_h = (tooltipFont->getFontHeight() + 2) * _wrappedLines.size() + _ypadding * 2;
 
-	_x = MIN<int16>(parent->_x + x + _xdelta, g_system->getOverlayWidth() - _w - 3);
-	_y = MIN<int16>(parent->_y + y + _ydelta, g_system->getOverlayHeight() - _h - 3);
+	_x = MIN<int16>(parent->_x + x + _xdelta + _xpadding, g_system->getOverlayWidth() - _w - _xpadding * 2);
+	_y = MIN<int16>(parent->_y + y + _ydelta + _ypadding, g_system->getOverlayHeight() - _h - _ypadding * 2);
 
 	if (g_gui.useRTL())
 		_x = g_system->getOverlayWidth() - _w - _x + g_gui.getOverlayOffset();
@@ -75,8 +77,8 @@ void Tooltip::drawDialog(DrawLayer layerToDraw) {
 
 	Dialog::drawDialog(layerToDraw);
 
-	int16 textX = g_gui.useRTL() ? _x - 3 : _x + 3; // including 2px padding and 1px original code shift
-	int16 textY = _y + 3;
+	int16 textX = g_gui.useRTL() ? _x - 1 - _xpadding : _x + 1 + _xpadding;
+	int16 textY = _y + 1 + _ypadding;
 
 	Graphics::TextAlign textAlignment = g_gui.useRTL() ? Graphics::kTextAlignRight : Graphics::kTextAlignLeft;
 
diff --git a/gui/Tooltip.h b/gui/Tooltip.h
index 66e0d7bcba..7cbd17b9b2 100644
--- a/gui/Tooltip.h
+++ b/gui/Tooltip.h
@@ -70,6 +70,7 @@ protected:
 
 	int _maxWidth;
 	int _xdelta, _ydelta;
+	int _xpadding, _ypadding;
 
 	Common::U32StringArray _wrappedLines;
 };
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 46d82e3515..94826537b2 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx
index 3e95a6a7ff..66c522e2ea 100644
--- a/gui/themes/scummremastered/remastered_layout.stx
+++ b/gui/themes/scummremastered/remastered_layout.stx
@@ -58,6 +58,8 @@
 		<def var = 'Tooltip.MaxWidth' value = '200' scalable = 'yes'/>
 		<def var = 'Tooltip.XDelta' value = '16' scalable = 'yes'/> <!-- basically cursor size -->
 		<def var = 'Tooltip.YDelta' value = '32' scalable = 'yes'/>
+		<def var = 'Tooltip.XPadding' value = '2' scalable = 'yes'/>
+		<def var = 'Tooltip.YPadding' value = '2' scalable = 'yes'/>
 
 		<def var = 'Predictive.Button.Width' value = '60' scalable = 'yes'/>
 		<def var = 'Predictive.ShowDeletePic' value = '1'/>
diff --git a/gui/themes/scummremastered/remastered_layout_lowres.stx b/gui/themes/scummremastered/remastered_layout_lowres.stx
index acc170e9b7..c05368635d 100644
--- a/gui/themes/scummremastered/remastered_layout_lowres.stx
+++ b/gui/themes/scummremastered/remastered_layout_lowres.stx
@@ -50,6 +50,8 @@
 		<def var = 'Tooltip.MaxWidth' value = '70' scalable = 'yes'/>
 		<def var = 'Tooltip.XDelta' value = '9' scalable = 'yes'/> <!-- basically cursor size -->
 		<def var = 'Tooltip.YDelta' value = '18' scalable = 'yes'/>
+		<def var = 'Tooltip.XPadding' value = '2' scalable = 'yes'/>
+		<def var = 'Tooltip.YPadding' value = '2' scalable = 'yes'/>
 
 		<def var = 'Predictive.Button.Width' value = '45' scalable = 'yes'/>
 		<def var = 'Predictive.Button.Height' value = '15' scalable = 'yes'/>