[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.LokDialog.js |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3c24a06bd4d8a0c44a0cb8cc1901c608c13ec6bf
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Feb 3 17:32:25 2019 -0500
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Mar 15 15:44:49 2019 +0100

    leaflet: align drop-down lists with parent combobox
    
    This ensures that child-windows are aligned correctly
    with their parents.
    
    Change-Id: I3c491fb34083f26c7d376924ab04fbce83103f22
    Reviewed-on: https://gerrit.libreoffice.org/68250
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index b8b7d7ed3..a4a23254d 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -644,12 +644,12 @@ L.Control.LokDialog = L.Control.extend({
 		var dialogTitle = $('.lokdialog_notitle');
 		if (dialogTitle != null && dialogTitle.length == 0) {
 			var dialogTitleBar = $('.ui-dialog-titlebar');
-			top += dialogTitleBar.height() * L.getDpiScaleFactor();
+			top += dialogTitleBar.outerHeight() * L.getDpiScaleFactor();
 		}
 
 		floatingCanvas.id = strId + '-floating';
 		L.DomUtil.setStyle(floatingCanvas, 'position', 'absolute');
-		L.DomUtil.setStyle(floatingCanvas, 'left', left + 'px'); // yes, it's necessary to append 'px'
+		L.DomUtil.setStyle(floatingCanvas, 'left', (left - 1) + 'px'); // Align drop-down list with parent.
 		L.DomUtil.setStyle(floatingCanvas, 'top', top + 'px');
 
 		// attach events