loleaflet/src/control/Control.LokDialog.js | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit 0c5524f89a405ab30ae91c4d75e72343195f8942
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Sat Apr 20 23:32:37 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon May 6 10:06:32 2019 +0200
tdf#124235: Fix the same problem on all platforms the same way
Reviewed-on: https://gerrit.libreoffice.org/71023
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
(cherry picked from commit ede2c3432f1d25c1c74b94f8fd5686fd59750e7b)
Change-Id: Ie7ede59841898a0738af7e44a3c0fe89db1cd3ee
Reviewed-on: https://gerrit.libreoffice.org/71842
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index b3e4bcd08..5961b165f 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -860,17 +860,7 @@ L.Control.LokDialog = L.Control.extend({
var dialogTitle = $('.lokdialog_notitle');
if (dialogTitle != null && dialogTitle.length == 0) {
var dialogTitleBar = $('.ui-dialog-titlebar');
- // tdf#124235: At least in the iOS app, multiplying with
- // L.getDpiScaleFactor() below causes the child of a
combo box to be
- // displaced from the fixed part. I see the same
problem also when using
- // Safari on a Retuna Mac against normal online. But as
I don't know whether
- // it happens also for other browsers on other
platforms on hidpi displays,
- // I will fix this for the iOS app only for now.
- if (!window.ThisIsTheiOSApp) {
- top += dialogTitleBar.outerHeight() *
L.getDpiScaleFactor();
- } else {
- top += dialogTitleBar.outerHeight();
- }
+ top += dialogTitleBar.outerHeight();
}
floatingCanvas.id = strId + '-floating';
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
