loleaflet/css/loleaflet.css | 4 ++++
loleaflet/src/control/Control.LokDialog.js | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 32eff8dd6b15df9f541e2988a596876c95f45e84
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Mar 27 15:13:41 2018 +0200
lokdialog: Don't show the title bar when no title was provided.
Change-Id: If08dc81e88d35a924d10695a38b138f6403e58bd
Reviewed-on: https://gerrit.libreoffice.org/51955
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index eae3e4f63..bcaf442f5 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -347,6 +347,10 @@ body {
text-indent: 1px;
}
+.lokdialog_container.lokdialog_notitle .ui-dialog-titlebar {
+ display: none;
+}
+
.lokdialog_container.ui-dialog.ui-widget-content {
padding: 0px;
overflow: visible;
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 19e936970..61c73abbc 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -246,6 +246,10 @@ L.Control.LokDialog = L.Control.extend({
L.DomEvent.on(dialogCanvas, 'contextmenu',
L.DomEvent.preventDefault);
+ var dialogClass = 'lokdialog_container';
+ if (!title)
+ dialogClass += ' lokdialog_notitle';
+
var that = this;
$(dialogContainer).dialog({
minWidth: width,
@@ -254,7 +258,7 @@ L.Control.LokDialog = L.Control.extend({
modal: false,
closeOnEscape: true,
resizable: false,
- dialogClass: 'lokdialog_container',
+ dialogClass: dialogClass,
close: function() {
that._onDialogClose(that._toRawDlgId(strDlgId),
true);
}
commit a35def2f74c8cef11171c9065960dc3b6fdc2fbe
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Jan 18 12:27:52 2018 +0530
loleaflet: No native contextmenu options on dialog canvas
Dialogs can have their own context menu invoked upon right click. And
they already works (i.e. are tunneled properly); so, let's use them.
Change-Id: I7d504923c272227dca94058995456d89e1079c29
(cherry picked from commit 63e089ec22150524d040f544538f8455e62a1887)
Reviewed-on: https://gerrit.libreoffice.org/48087
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 4dfb1ed4f..19e936970 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -244,6 +244,8 @@ L.Control.LokDialog = L.Control.extend({
dialogCanvas.height = height;
dialogCanvas.id = strDlgId + '-canvas';
+ L.DomEvent.on(dialogCanvas, 'contextmenu',
L.DomEvent.preventDefault);
+
var that = this;
$(dialogContainer).dialog({
minWidth: width,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
