strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

lokdialog: Don't strip the sub-menus in tunneled context menu.

Browse source 
Simplifies the vertical growing / shrinking of listbox popups too.

Change-Id: I8d8aa7e07a5bf9119713363dd95a5db843683feb
Reviewed-on: https://gerrit.libreoffice.org/51154
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
This commit is contained in:
Jan Holesovsky 2018-03-12 16:48:29 +01:00
parent 501d36824b
commit 17ef36d154
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
loleaflet/dist/loleaflet.css vendored
View file

@ -340,8 +340,8 @@ body {
}
.lokdialog_container.ui-dialog.ui-widget-content {
padding: 0px;
overflow: hidden;
padding: 0px;
overflow: visible;
width: auto;
height: auto;
border: none;
@ -350,7 +350,8 @@ body {
}
.lokdialog.ui-dialog-content.ui-widget-content {
padding: 0px;
padding: 0px;
overflow: visible;
}
.lokdialog_canvas {
@ -372,4 +373,4 @@ body {
.vex.vex-theme-bottom-right-corner .vex-content {
bottom: 40px !important;
right: 10px !important;
}
}

9
loleaflet/src/control/Control.LokDialog.js
View file

@ -229,7 +229,6 @@ L.Control.LokDialog = L.Control.extend({
var dialogContainer = L.DomUtil.create('div', 'lokdialog', document.body);
L.DomUtil.setStyle(dialogContainer, 'padding', '0px');
L.DomUtil.setStyle(dialogContainer, 'margin', '0px');
L.DomUtil.setStyle(dialogContainer, 'overflow', 'hidden');
dialogContainer.id = strDlgId;
var dialogCanvas = L.DomUtil.create('canvas', 'lokdialog_canvas', dialogContainer);
@ -375,14 +374,6 @@ L.Control.LokDialog = L.Control.extend({
ctx.drawImage(img, 0, 0);
};
img.src = imgData;
// increase the height of the container,
// so that if the floating window goes out of the parent,
// it doesn't get stripped off
height = parseInt(canvas.style.top) + canvas.height;
var currentHeight = parseInt($('#' + strDlgId).css('height'));
if (height > currentHeight)
$('#' + strDlgId).css('height', height + 'px');
},
_onDialogChildClose: function(dialogId) {