[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css | 10
loleaflet/css/mobilewizard.css| 56 --
loleaflet/src/control/Control.Menubar.js |4 -
loleaflet/src/control/Control.MobileWizard.js | 24 ++-
loleaflet/src/control/Control.PartsPreview.js |8 +++
loleaflet/src/control/Parts.js| 33 +--
loleaflet/src/layer/tile/ImpressTileLayer.js |4 -
7 files changed, 92 insertions(+), 47 deletions(-)
New commits:
commit 38d13dbc817f0970a89215a00e55cc666d6d16df
Author: gokaysatir
AuthorDate: Sat Sep 12 16:52:20 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 16 14:19:05 2020 +0200
loleaflet: Hide portrait view previews on layout view.
Header code is updated to avoid creating/deleting it every time.
Some CSS adjustments to increase maintainability. Example: There were 2
scroll bars in mobile-wizard. Scrolling was not smooth. And some other
improvements.
On layout view, 2 separate slide-sorter containers were visible. One of
them is hidden now.
Change-Id: Ic4201b176812f6ca00402777423feced7ee8284c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102848
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 3329a216e..e144f02f2 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -766,21 +766,15 @@ td[id^=tb_spreadsheet-toolbar_item]:focus
table.w2ui-button div.w2ui-icon, td[id
#mobile-wizard-header.landscape {
display: none;
}
-#mobile-wizard-content.with-slide-sorter-above.landscape {
- top: 48px !important;
-}
#mobile-wizard-header.portrait {
display: block;
}
-#mobile-wizard-content.with-slide-sorter-above.portrait {
- top: 111px !important;
-}
/* Related to mobile-wizard based menubar */
-#mobile-wizard.menuwizard.landscape
#mobile-wizard-content.with-slide-sorter-above.landscape {
+#mobile-wizard.menuwizard.landscape #mobile-wizard-content.landscape {
overflow-y: auto !important;
}
-#mobile-wizard.menuwizard.portrait
#mobile-wizard-content.with-slide-sorter-above.portrait {
+#mobile-wizard.menuwizard.portrait #mobile-wizard-content.portrait {
overflow-y: hidden !important;
}
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 1dc843408..c6a418e1e 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -190,10 +190,12 @@ p.mobile-wizard.ui-combobox-text.selected {
#mobile-wizard-content {
overflow-y: scroll;
overflow-x: hidden;
- position: absolute;
- top: 111px;
- bottom: 0px;
+ position: static;
width: 100%;
+ height: calc(100% - 48px);
+}
+#mobile-wizard.portrait > #mobile-wizard-header:not([style*='none']) ~
#mobile-wizard-content {
+ height: calc(100% - 121px);
}
#mobile-wizard.funcwizard div#mobile-wizard-content.hideHelpBG {
background: none !important;
@@ -201,19 +203,13 @@ p.mobile-wizard.ui-combobox-text.selected {
#mobile-wizard.funcwizard div#mobile-wizard-content.showHelpBG {
background: url(images/lc_helpindex_secondary.svg) no-repeat right 16px
bottom 88px / 124px !important;
}
-#mobile-wizard-content:not(.with-slide-sorter-above), .menuwizard
#mobile-wizard-content.with-slide-sorter-above{
- top: 48px !important;
-}
-#mobile-wizard-content.with-slide-sorter-above {
- top: 128px !important;
- overflow-x: hidden;
-}
+
#ParaPropertyPanel > .ui-content{
display: flex;
flex-wrap: wrap !important;
justify-content: space-around;
}
-.with-slide-sorter-above > .ui-tabs-content > div[title=Layouts]{
+.ui-tabs-content > div[title='Layouts']{
justify-content: center;
-ms-box-orient: horizontal !important;
display: -webkit-box;
@@ -224,8 +220,9 @@ p.mobile-wizard.ui-combobox-text.selected {
display: flex;
align-self: center !important;
align-items: center !important;
- -webkit-flex-wrap: wrap !important;
- flex-wrap: wrap !important;
+ -webkit-flex-wrap: wrap !important;
+ flex-wrap: wrap !important;
+ margin-top: 25px;
}
#rotationlabel, #cellbackgroundlabel, #NumberFormatCurrency > .unolabel,
#NumberFormatPercent > .unolabel, #NumberFormatDecimal > .unolabel{
display: none;
@@ -259,13 +256,13 @@ p.mobile-wizard.ui-combobox-text.selected {
}
#mobile-wizard {
- width: 100%;
- position: fixed;
- bottom: 0px;
- z-index: 1000;
- background-color: white;
- box-shadow: 0px -2px 4px 1px #0030;
- overflow-y: scroll;
+ width: 100%;
+ position: fixed;
+ bottom: 0px;
+ z-index: 1000;
+ background-color: white;
+ box-shadow: 0px -2px 4px 1px #0030;
+
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |3 ++-
loleaflet/src/control/Control.PartsPreview.js |3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit dcbaeb9ec1f6b2833815cf00e4dd4b62d635a180
Author: gokaysatir
AuthorDate: Fri Aug 28 15:58:46 2020 +0300
Commit: Andras Timar
CommitDate: Tue Sep 1 08:03:03 2020 +0200
loleaflet: Slides preview section improvements.
Change-Id: I4018cbc30d7b8b03f117bb229bf637706c70dc26
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101546
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
(cherry picked from commit 9c23e570421c881647c6035fa6ba00cd203f7ea5)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101669
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index c6f8e7d5f..ca860b9f3 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -700,8 +700,9 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-frame-portrait {
max-height: 60px;
max-width: 100%;
- display: table-cell;
+ display: inline-block;
padding-right: 1em;
+ margin: 0;
}
.preview-frame-portrait.preview-img-dropsite {
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index af553f552..e529fad22 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -62,6 +62,9 @@ L.Control.PartsPreview = L.Control.extend({
}
}
});
+
+ var scrollContainer =
$(this._partsPreviewCont).find('.mCSB_container').get(0);
+ scrollContainer.style.whiteSpace = 'nowrap';
},
_updateDisabled: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/leaflet.css|5 +
loleaflet/css/loleaflet.css |6 +++---
loleaflet/src/control/Control.Toolbar.js |6 ++
loleaflet/src/layer/marker/Cursor.js |4 +++-
4 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit 511d0cd956ea10b52c7b19aafa5b3fa2a4c6f6fc
Author: Pranam Lashkari
AuthorDate: Mon Aug 31 17:54:15 2020 +0530
Commit: Pranam Lashkari
CommitDate: Mon Aug 31 19:22:56 2020 +0200
leaflet: changing cursor according to objects selected
text cursor only if cursor is visible
appropriate cursor for drag markers
move cursor for selected object
Change-Id: If750ac91fc870a0d730d4455c51bde0423c55e4a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101727
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pranam Lashkari
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 88ee4572a..d8f1217ce 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -184,10 +184,7 @@
/* cursors */
.leaflet-interactive {
- cursor: pointer;
- }
-.leaflet-container {
- cursor: text;
+ cursor: move;
}
.leaflet-crosshair,
.leaflet-crosshair .leaflet-interactive {
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index e60639b08..90f4afced 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -47,14 +47,14 @@
z-index: 1000;
}
-#document-container.text-doctype > #map{
- cursor: text;
-}
.scroll-container .mCSB_scrollTools.mCSB_1_scrollbar {
position: absolute;
z-index: 1000;
}
+.bucket-cursor {
+ cursor: url('images/cursors/fill.png'), auto !important;
+}
.loleaflet-scrollbar-show {
opacity: 1 !important;
filter: "alpha(opacity=100)" !important;
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index bc2f590ed..1595be0b0 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -842,6 +842,12 @@ function onCommandStateChanged(e) {
toolbar.disable('repair');
}
}
+ else if (commandName === '.uno:FormatPaintbrush') {
+ if (state === 'true')
+
$('.leaflet-pane.leaflet-map-pane').addClass('bucket-cursor');
+ else
+
$('.leaflet-pane.leaflet-map-pane').removeClass('bucket-cursor');
+ }
var id = unoCmdToToolbarId(commandName);
// id is set to '' by unoCmdToToolbarId() if the statechange message
should be ignored.
diff --git a/loleaflet/src/layer/marker/Cursor.js
b/loleaflet/src/layer/marker/Cursor.js
index b7a0ba1a9..4e415b620 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -3,6 +3,7 @@
* L.Cursor blinking cursor.
*/
+ /* global $ */
L.Cursor = L.Layer.extend({
options: {
@@ -22,7 +23,7 @@ L.Cursor = L.Layer.extend({
if (!this._container) {
this._initLayout();
}
-
+ $('.leaflet-pane.leaflet-map-pane').css('cursor', 'text');
this._zoomAnimated = this._zoomAnimated &&
this.options.zoomAnimation;
if (this._zoomAnimated) {
L.DomUtil.addClass(this._container,
'leaflet-zoom-animated');
@@ -33,6 +34,7 @@ L.Cursor = L.Layer.extend({
},
onRemove: function () {
+ $('.leaflet-pane.leaflet-map-pane').css('cursor', '');
if (this._container) {
this.getPane().removeChild(this._container);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css|4 ++--
loleaflet/css/spreadsheet.css |8 +++-
loleaflet/src/control/Control.LokDialog.js | 25 +
loleaflet/src/control/Control.Tabs.js |1 -
4 files changed, 6 insertions(+), 32 deletions(-)
New commits:
commit 13445521016e3c274843b7d2a1dd0b72202eec05
Author: gokaysatir
AuthorDate: Fri Jul 10 15:06:27 2020 +0300
Commit: Andras Timar
CommitDate: Wed Aug 26 11:46:50 2020 +0200
loleaflet: sidebar overlap issue.
Change-Id: Iff2184725c49c24900865d9865237e9747a050cb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98555
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Tested-by: Henry Castro
Reviewed-by: Henry Castro
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101383
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 57ec51d9e..e60639b08 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -158,7 +158,7 @@ body {
position: absolute;
top: 77px;
right: 0px;
- bottom: 37px;
+ bottom: 72px;
border-top: 1px solid #b6b6b6;
border-left: 1px solid #b6b6b6;
overflow: hidden;
@@ -172,7 +172,7 @@ body {
width: auto;
height: 100%;
overflow-x: hidden;
- overflow-y: scroll;
+ overflow-y: auto;
z-index: 1200;
}
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 1934933b5..6111444a7 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -2,7 +2,7 @@
border-top: 1px solid #B6B6B6;
top: 137px;
left: 50px;
- bottom: 65px;
+ bottom: 75px;
}
#document-container.spreadsheet-document.readonly {
@@ -13,7 +13,7 @@
border-top: 1px solid #B6B6B6;
top: 100px;
left: 50px;
- bottom: 68px;
+ bottom: 78px;
}
.spreadsheet-tabs-container {
@@ -36,14 +36,12 @@
height: 100%;
overflow: auto;
padding-bottom: 20px; /* to hide the horizontal scrollbar */
- padding-right: 5px; /* to hide the vertical scrollbar */
-
margin-left: 6px;
}
.spreadsheet-tab {
margin: 0px;
- margin-top: 2px;
+ margin-top: 4px;
margin-right: 3px;
padding-left: 9px;
padding-right: 9px;
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index b46fa91c4..4228f46d7 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1628,7 +1628,7 @@ L.Control.LokDialog = L.Control.extend({
spreadsheetRowColumnFrame.style.right =
width.toString() + 'px';
this._resizeCalcInputBar(deckOffset);
- this._adjustTabsBar(width);
+
},
_resizeCalcInputBar: function(offset) {
@@ -1649,29 +1649,6 @@ L.Control.LokDialog = L.Control.extend({
}
},
- _adjustTabsBar: function(deckNewWidth) {
-
- if (this._map.getDocType() !== 'spreadsheet') {
- return;
- }
-
- // This is called only if sidebar is made visible or hidden, so
no need of
- // special-casing for mobile where that never happens.
- // In the case of tablets, when sidebar is made visible/hidden
the below adjustments
- // will work correctly like in desktop-online (verified with
chrome-tablet emulator).
-
- var tabsContainer =
L.DomUtil.get('spreadsheet-tabs-container-id');
- if (!tabsContainer) {
- return;
- }
-
- var docWidth =
L.DomUtil.get('spreadsheet-toolbar').getBoundingClientRect().width;
- var tabsContainerLeft =
tabsContainer.getBoundingClientRect().left;
- var deckMargin = (deckNewWidth === 0) ? 0 : 10;
-
- tabsContainer.style.width = (docWidth - tabsContainerLeft -
deckNewWidth - deckMargin) + 'px';
- },
-
_onDialogChildClose: function(dialogId) {
$('#' + this._toStrId(dialogId) + '-floating').remove();
if (!this._isSidebar(dialogId) &&
!this.isCalcInputBar(dialogId)) {
diff --git a/loleaflet/src/control/Control.Tabs.js
b/loleaflet/src/control/Control.Tabs.js
index 7bb681364..06ccd043a 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -42,7 +42,6 @@ L.Control.Tabs = L.Control.extend({
var map = this._map;
var docContainer = map.options.documentContainer;
this._tabsCont = L.DomUtil.create('div',
'spreadsheet-tabs-container', docContainer.parentElement);
-
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |2 +-
loleaflet/src/control/Control.PartsPreview.js | 10 +++---
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 55beee680ee4e59e077f35a6ef07284c538063a3
Author: gokaysatir
AuthorDate: Tue Aug 25 13:42:05 2020 +0300
Commit: Andras Timar
CommitDate: Tue Aug 25 20:53:59 2020 +0200
Loleaflet: Impress image previews are adjusted.
Change-Id: I0c333b58e823702678c4c292de2f58adabbdb3c1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101167
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index d0eec0d6a..ba7c0cb76 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -696,7 +696,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-frame-portrait {
max-height: 60px;
- max-width: initial;
+ max-width: 100%;
display: table-cell;
padding-right: 1em;
}
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 7d4648f7d..718d65b50 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -12,8 +12,8 @@ L.Control.PartsPreview = L.Control.extend({
frameClass: '',
axis: '',
allowOrientation: true,
- maxWidth: !window.mode.isDesktop() ? 60 : 180,
- maxHeight: !window.mode.isDesktop() ? 60 : 180
+ maxWidth: window.mode.isDesktop() ? 180:
(window.mode.isTablet() ? 120: 60),
+ maxHeight: window.mode.isDesktop() ? 180:
(window.mode.isTablet() ? 120: 60)
},
partsFocused: false,
@@ -129,6 +129,7 @@ L.Control.PartsPreview = L.Control.extend({
this._previewTiles.push(this._createPreview(i, e.partNames[i], bottomBound));
}
L.DomUtil.addClass(this._previewTiles[selectedPart], 'preview-img-currentpart');
+ this._onScroll(); // Load previews.
this._previewInitialized = true;
}
else
@@ -314,11 +315,6 @@ L.Control.PartsPreview = L.Control.extend({
this._previewFrameHeight = imgHeight + 2 *
previewImgBorder;
}
}
-
- if (!window.mode.isDesktop() && imgSize) {
- L.DomUtil.setStyle(img, 'width', imgSize.width + 'px');
- L.DomUtil.setStyle(img, 'height', imgSize.height +
'px');
- }
},
_setPart: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css | 40 +++
loleaflet/src/control/Control.JSDialogBuilder.js |7 ++--
2 files changed, 45 insertions(+), 2 deletions(-)
New commits:
commit 64c3aa7407b9fa76d5ec92ba10c7d71d3012a276
Author: Szymon Kłos
AuthorDate: Thu Aug 13 12:19:55 2020 +0200
Commit: Andras Timar
CommitDate: Mon Aug 17 18:35:11 2020 +0200
mobile-wizard: style radio buttons
Change-Id: Iee03b7fceada0ab1166ba35438da50b178a99ce7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100652
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 177cf7877..ace890f29 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -791,6 +791,46 @@ div#mobile-wizard-content .spinfieldcontainer
.spinfieldimage.disabled {
top: -20px;
width: 16px;
}
+
+#mobile-wizard input[type=radio]:disabled{
+ border: 2px solid #ddd;
+ box-shadow: none;
+}
+#mobile-wizard input[type=radio]{
+ border-radius: 50%;
+ appearance: none;
+ width: 24px;
+ height: 24px;
+ margin: 10px 20px 10px 0px !important;
+ float: right;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ -o-appearance: none;
+ appearance: none;
+ border: 2px solid #aaa;
+ outline: none;
+ box-shadow: #0015 0px 0px 2px 1px;
+}
+#mobile-wizard input[type=radio]:checked{
+ background: url(images/lc_ok_white.svg) no-repeat center;
+ background-color: #0b87e7;
+ border: 2px solid #0b87e7;
+ outline: none;
+ box-shadow: none;
+}
+#mobile-wizard input[type=radio]:checked:disabled{
+ background-color: #ddd !important;
+ border: 2px solid #ddd !important;
+}
+#mobile-wizard input[type=radio]:before{
+ width: 20px;
+ height: 20px;
+}
+#mobile-wizard input[type=radio]:after{
+ top: -20px;
+ width: 16px;
+}
+
#enablecontour + label{
line-height: 44px;
vertical-align: baseline;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 00bcf2fd3..7f515566d 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -781,10 +781,13 @@ L.Control.JSDialogBuilder = L.Control.extend({
},
_radiobuttonControl: function(parentContainer, data, builder) {
- var radiobutton = L.DomUtil.createWithId('input', data.id,
parentContainer);
+ var container = L.DomUtil.createWithId('div', data.id +
'-container', parentContainer);
+ L.DomUtil.addClass(container, 'radiobutton');
+
+ var radiobutton = L.DomUtil.createWithId('input', data.id,
container);
radiobutton.type = 'radio';
- var radiobuttonLabel = L.DomUtil.create('label', '',
parentContainer);
+ var radiobuttonLabel = L.DomUtil.create('label', '', container);
radiobuttonLabel.innerHTML = builder._cleanText(data.text);
radiobuttonLabel.for = data.id;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css |2 +-
loleaflet/src/control/Control.JSDialogBuilder.js |6 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 745bc47a0434e60854ab4f5b05c7ef16c0d74f6f
Author: Szymon Kłos
AuthorDate: Tue Aug 11 11:32:14 2020 +0200
Commit: Jan Holesovsky
CommitDate: Fri Aug 14 22:43:58 2020 +0200
mobile-wizard: improve calc shape shadow panel
- use listboxes
- reduce input to make space for -/+ controls
- working color selector
Change-Id: Ia9df4fbc09132474985d169d7b0d55985461ec2b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100472
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 8cba28d8e..177cf7877 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -700,7 +700,7 @@ a.leaflet-control-zoom-in {
#DecrementIndent + input:disabled{display: none;}
div#mobile-wizard-content input[type=number]{
height: 46px;
- width: 42%;
+ width: 40%;
padding-left: 8%;
border: none;
-moz-appearance: textfield;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 980ba21e7..00bcf2fd3 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1412,7 +1412,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (data.id === 'applystyle' ||
data.id === 'fontnamecombobox' ||
data.id === 'fontsizecombobox' ||
- data.id === 'FontBox') {
+ data.id === 'FontBox' ||
+ data.id === 'LB_ANGLE' ||
+ data.id === 'LB_DISTANCE') {
builder._listboxControl(parentContainer, data, builder);
} else if (data.id === 'searchterm' ||
data.id === 'replaceterm') {
@@ -1765,6 +1767,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
builder.map['stateChangeHandler'].setItemValue(data.command,
params[data.id].value);
builder.map.sendUnoCommand(data.command, params);
return;
+ } else if (data.id === 'LB_SHADOW_COLOR') {
+ data.command = '.uno:FillShadowColor';
}
var command = data.command + '?Color:string=' + color;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |6 +++---
loleaflet/src/control/Control.PartsPreview.js | 15 ++-
2 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit e6b3149825e19b69e8381651b0e3dbddc371a703
Author: Henry Castro
AuthorDate: Thu Jun 11 09:35:25 2020 -0400
Commit: Henry Castro
CommitDate: Tue Aug 11 21:46:27 2020 +0200
android: fix thumbnails images when portrait orientation is set
Change-Id: I70aee6b569f78795487cbff736130e0e7413e852
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96123
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100553
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index ca7007b6a..0343a3a94 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -584,14 +584,14 @@ td[id^=tb_spreadsheet-toolbar_item]:focus
table.w2ui-button div.w2ui-icon, td[id
/* Related to slidesorter */
/* Show slidesorter beyond 768px only */
#presentation-controls-wrapper {
- top: initial;
+ top: 41px;
left: initial;
bottom: 33px;
max-width: initial;
}
#presentation-controls-wrapper.readonly {
- top: initial;
+ top: 41px;
bottom: 0px;
}
@@ -691,7 +691,6 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-img-portrait {
min-width: 37px;
max-width: 60px;
- max-height: 45px;
margin: 0px;
}
@@ -721,6 +720,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
}
#document-container.landscape.parts-preview-document {
+ top: 41px;
left: 66px !important;
bottom: 33px;
}
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 6143ee28b..da01e151d 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -12,8 +12,8 @@ L.Control.PartsPreview = L.Control.extend({
frameClass: '',
axis: '',
allowOrientation: true,
- maxWidth: (window.mode.isMobile() || window.mode.isTablet()) ?
60 : 180,
- maxHeight: (window.mode.isMobile() || window.mode.isTablet()) ?
60 : 180
+ maxWidth: !window.mode.isDesktop() ? 60 : 180,
+ maxHeight: !window.mode.isDesktop() ? 60 : 180
},
partsFocused: false,
@@ -120,7 +120,7 @@ L.Control.PartsPreview = L.Control.extend({
frame.setAttribute('draggable', false);
frame.setAttribute('id', 'first-drop-site');
- if (!window.mode.isMobile()) {
+ if (window.mode.isDesktop()) {
L.DomUtil.setStyle(frame, 'height',
'20px');
L.DomUtil.setStyle(frame, 'margin',
'0em');
}
@@ -206,7 +206,7 @@ L.Control.PartsPreview = L.Control.extend({
img.hash = hashCode;
img.src = L.Icon.Default.imagePath + '/preview_placeholder.png';
img.fetched = false;
- if (window.mode.isMobile() || window.mode.isTablet()) {
+ if (!window.mode.isDesktop()) {
(new Hammer(img, {recognizers: [[Hammer.Press]]}))
.on('press', function (e) {
if (this._map.isPermissionEdit()) {
@@ -302,7 +302,7 @@ L.Control.PartsPreview = L.Control.extend({
var previewImgMinWidth =
Math.round(parseFloat(L.DomUtil.getStyle(img, 'min-width')));
var imgHeight = imgSize.height;
var imgWidth = imgSize.width;
- if (imgSize.width < previewImgMinWidth)
+ if (imgSize.width < previewImgMinWidth &&
window.mode.isDesktop())
imgHeight = Math.round(imgHeight *
previewImgMinWidth / imgSize.width);
var previewFrameBB =
img.parentElement.getBoundingClientRect();
if (this._direction === 'x') {
@@ -315,6 +315,11 @@ L.Control.PartsPreview = L.Control.extend({
this._previewFrameHeight = imgHeight + 2 *
previewImgBorder;
}
}
+
+ if (!window.mode.isDesktop() && imgSize) {
+ L.DomUtil.setStyle(img, 'width', imgSize.width + 'px');
+ L.DomUtil.setStyle(img, 'height', imgSize.height +
'px');
+ }
},
_setPart: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css |4
loleaflet/src/control/Control.AlertDialog.js |1 +
2 files changed, 5 insertions(+)
New commits:
commit 6051ccd7da466eab53223d4320549246246fef2c
Author: gokaysatir
AuthorDate: Mon Aug 10 11:10:30 2020 +0300
Commit: Jan Holesovsky
CommitDate: Tue Aug 11 19:41:04 2020 +0200
loleaflet: Wrap long words on hyperlink open dialog.
Change-Id: I944b2314c766f7e3f7f313a5afea3b022b637c05
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100416
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
(cherry picked from commit 091df95ac1e8615a65e116a338a4ae643910e030)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100512
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 8fe837734..155188180 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -598,3 +598,7 @@ body {
.drop-down-field-list-item:hover {
background: #0b87e7;
}
+
+.word-wrap-for-vex-dialog {
+ overflow-wrap: break-word;
+}
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.AlertDialog.js
b/loleaflet/src/control/Control.AlertDialog.js
index 67224907a..8118a30f1 100644
--- a/loleaflet/src/control/Control.AlertDialog.js
+++ b/loleaflet/src/control/Control.AlertDialog.js
@@ -71,6 +71,7 @@ L.Control.AlertDialog = L.Control.extend({
vex.dialog.open({
message: messageText,
showCloseButton: true,
+ contentClassName: 'word-wrap-for-vex-dialog',
buttons: buttonsList,
callback: function() {},
afterClose: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css|9 +
loleaflet/src/control/Control.LokDialog.js | 10 ++
loleaflet/src/control/Toolbar.js |8 +++-
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit e51ca347694dbb15edb1806c1b2a2290238948d2
Author: Szymon Kłos
AuthorDate: Tue Aug 11 07:56:26 2020 +0200
Commit: Jan Holesovsky
CommitDate: Tue Aug 11 13:47:09 2020 +0200
Don't allow to open multiple dialogs
and blink active dialog to inform user that he needs
to close dialog first...
Change-Id: I6c9ee662ae2ab935f03ee8fdd0cf7327703e2170
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100457
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 0d7d7e05a..8fe837734 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -544,6 +544,15 @@ body {
-o-user-select: none;
}
+.lokblink {
+animation: blink 150ms infinite alternate;
+}
+
+@keyframes blink {
+from { opacity:1; }
+to { opacity:0; }
+}
+
.form-field-frame {
border: 1px solid;
position: absolute;
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 7fec217d4..b69c0e446 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -134,6 +134,16 @@ L.Control.LokDialog = L.Control.extend({
_currentDeck: null, // The sidebar.
_calcInputBar: null, // The Formula-Bar.
+ hasOpenedDialog: function() {
+ var nonDialogEntries = 0;
+ for (var index in this._dialogs) {
+ if (this._dialogs[index].isSidebar ||
this._dialogs[index].isCalcInputBar)
+ nonDialogEntries++;
+ }
+
+ return Object.keys(this._dialogs).length > nonDialogEntries;
+ },
+
_docLoaded: function(e) {
if (!e.status) {
$('.lokdialog_container').remove();
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 1b55c34b8..19b899d75 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -158,7 +158,13 @@ L.Map.include({
sendUnoCommand: function (command, json) {
var isAllowedInReadOnly = command == '.uno:WordCountDialog';
- if (this.isPermissionEdit() || isAllowedInReadOnly) {
+ var hasOpenedDialog = this.dialog.hasOpenedDialog();
+ if (hasOpenedDialog) {
+ $('.lokdialog_container').addClass('lokblink');
+ setTimeout(function () {
+
$('.lokdialog_container').removeClass('lokblink');
+ }, 600);
+ } else if (this.isPermissionEdit() || isAllowedInReadOnly) {
this._socket.sendMessage('uno ' + command + (json ? ' '
+ JSON.stringify(json) : ''));
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css |4 +
loleaflet/src/control/Control.JSDialogBuilder.js | 64 ++-
2 files changed, 66 insertions(+), 2 deletions(-)
New commits:
commit 402a42d3db9e5d3b1836c5fd5010c5a5f7054b02
Author: Szymon Kłos
AuthorDate: Mon Aug 10 12:58:53 2020 +0200
Commit: Jan Holesovsky
CommitDate: Mon Aug 10 21:12:12 2020 +0200
mobile-wizard: update selected cell border style
Change-Id: Id2f98c0824e589d63d658f00b384fa0abfb48f2f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100425
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 0d9ef8a62..8cba28d8e 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -299,6 +299,10 @@ p.mobile-wizard.ui-combobox-text.selected {
-webkit-box-shadow: inset 0px 0px 0px 2px #fff;
box-shadow: inset 0px 0px 0px 2px #fff;
}
+#mobile-wizard-content > #ScCellAppearancePropertyPanel >
.ui-content.level-0.mobile-wizard .borderbutton.selected {
+ -webkit-box-shadow: inset 0px 0px 0px 2px #0867af !important;
+ box-shadow: inset 0px 0px 0px 2px #0867af !important;
+}
.ui-header.mobile-wizard {
width: 100%;
height: 56px !important;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 101e3d3bb..6a2f8e0aa 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1846,7 +1846,48 @@ L.Control.JSDialogBuilder = L.Control.extend({
return false;
},
- _borderControlItem: function(parentContainer, data, builder, i) {
+ _getCurrentBorderNumber: function(builder) {
+ var outer =
builder.map['stateChangeHandler'].getItemValue('.uno:BorderOuter');
+ var inner =
builder.map['stateChangeHandler'].getItemValue('.uno:BorderInner');
+
+ if (!outer || !inner)
+ return 0;
+
+ var left = outer.left === 'true';
+ var right = outer.right === 'true';
+ var bottom = outer.bottom === 'true';
+ var top = outer.top === 'true';
+ var horiz = inner.horizontal === 'true';
+ var vert = inner.vertical === 'true';
+
+ if (left && !right && !bottom && !top && !horiz && !vert) {
+ return 2;
+ } else if (!left && right && !bottom && !top && !horiz &&
!vert) {
+ return 3;
+ } else if (left && right && !bottom && !top && !horiz && !vert)
{
+ return 4;
+ } else if (!left && !right && !bottom && top && !horiz &&
!vert) {
+ return 5;
+ } else if (!left && !right && bottom && !top && !horiz &&
!vert) {
+ return 6;
+ } else if (!left && !right && bottom && top && !horiz && !vert)
{
+ return 7;
+ } else if (left && right && bottom && top && !horiz && !vert) {
+ return 8;
+ } else if (!left && !right && bottom && top && horiz && !vert) {
+ return 9;
+ } else if (left && right && bottom && top && horiz && !vert) {
+ return 10;
+ } else if (left && right && bottom && top && !horiz && vert) {
+ return 11;
+ } else if (left && right && bottom && top && horiz && vert) {
+ return 12;
+ }
+
+ return 1;
+ },
+
+ _borderControlItem: function(parentContainer, data, builder, i,
selected) {
var button = null;
var div = this._createIdentifiable('div', 'ui-content unospan',
parentContainer, data);
@@ -1856,6 +1897,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
button.src = L.LOUtil.getImageURL('fr0' + i + '.svg');
button.id = buttonId;
+ if (selected)
+ $(button).addClass('selected');
+
$(div).click(function () {
var color = 0;
// Find our associated color picker
@@ -1870,8 +1914,24 @@ L.Control.JSDialogBuilder = L.Control.extend({
var bordercontrollabel = L.DomUtil.create('p',
builder.options.cssClass + ' ui-text', parentContainer);
bordercontrollabel.innerHTML = _('Cell borders');
bordercontrollabel.id = data.id + 'label';
+ var current = builder._getCurrentBorderNumber(builder);
for (var i = 1; i < 13; ++i)
- builder._borderControlItem(parentContainer, data,
builder, i);
+ builder._borderControlItem(parentContainer, data,
builder, i,
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css | 10 +-
loleaflet/src/control/Control.PartsPreview.js | 114 +++---
2 files changed, 112 insertions(+), 12 deletions(-)
New commits:
commit a7f82d2ede40db10985406168eab38fbff44b799
Author: Pranam Lashkari
AuthorDate: Fri Jul 10 17:05:43 2020 +0530
Commit: Pranam Lashkari
CommitDate: Thu Jul 30 12:44:46 2020 +0200
tdf#133283 leaflet: fixed reordering of slide with drag and drop in touch
screens
Changed the gestures:
1st tap to select the slide
2nd tap will open the mobile wizard
long press and then drag and drop the slides
Change-Id: I44a874f69eed4586667f7fbe825d5da943565071
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99527
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pranam Lashkari
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 24f26678a..ca7007b6a 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -702,6 +702,12 @@ td[id^=tb_spreadsheet-toolbar_item]:focus
table.w2ui-button div.w2ui-icon, td[id
padding-right: 1em;
}
+.preview-frame-portrait.preview-img-dropsite {
+padding-right: 0px;
+ border-right: 20px solid #b6b6b6;
+ border-bottom: none;
+}
+
/* Slidesorter in landscape mode */
#presentation-controls-wrapper.landscape {
top: 41px;
@@ -746,8 +752,8 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
}
/* Highlight where a slide can be dropped when reordering by drag-and-drop. */
-.preview-img-dropsite {
-border-bottom: 3px solid #b6b6b6;
+.preview-frame-landscape.preview-img-dropsite {
+border-bottom: 10px solid #b6b6b6;
}
/* Related to mobilewizard.cxx */
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 860ad6bb7..f7f11e348 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -122,6 +122,7 @@ L.Control.PartsPreview = L.Control.extend({
var frame = L.DomUtil.create('div',
'preview-frame', this._scrollContainer);
this._addDnDHandlers(frame);
frame.setAttribute('draggable', false);
+ frame.setAttribute('id', 'first-drop-site');
if (!window.mode.isMobile()) {
L.DomUtil.setStyle(frame, 'height',
'20px');
@@ -187,21 +188,31 @@ L.Control.PartsPreview = L.Control.extend({
img.fetched = false;
if (window.mode.isMobile() || window.mode.isTablet()) {
(new Hammer(img, {recognizers: [[Hammer.Press]]}))
- .on('press', L.bind(function () {
- if (this._map._permission === 'edit') {
- setTimeout(function () {
-
w2ui['actionbar'].click('mobile_wizard');
- }, 0);
+ .on('press', function (e) {
+ if (this._map.isPermissionEdit()) {
+ this._addDnDTouchHandlers(e);
}
- }, this));
+ }.bind(this));
}
L.DomEvent.on(img, 'click', function (e) {
L.DomEvent.stopPropagation(e);
L.DomEvent.stop(e);
- this._setPart(e);
- this._map.focus();
- this.partsFocused = true;
- document.activeElement.blur();
+ var part =
$(this._partsPreviewCont).find('.mCSB_container
.preview-frame').index(e.target.parentNode);
+ if (part !== null)
+ var partId = parseInt(part) - 1; // The first
part is just a drop-site for reordering.
+ if (!window.mode.isDesktop() && partId ===
this._map._docLayer._selectedPart) {
+ // if mobile or tab then second tap will open
the mobile wizard
+ if (this._map._permission === 'edit') {
+ setTimeout(function () {
+
w2ui['actionbar'].click('mobile_wizard');
+ }, 0);
+ }
+ } else {
+ this._setPart(e);
+ this._map.focus();
+ this.partsFocused = true;
+ document.activeElement.blur();
+ }
}, this);
var topBound = this._previewContTop;
@@ -491,6
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/leaflet.css |3 +-
loleaflet/css/loleaflet.css | 10 +++
loleaflet/src/layer/marker/ProgressOverlay.js | 36 +++---
loleaflet/src/map/Map.js |8 -
4 files changed, 23 insertions(+), 34 deletions(-)
New commits:
commit fb8ee44f489f8cb6172b676a8015d2461909
Author: Szymon Kłos
AuthorDate: Tue Jul 28 16:01:07 2020 +0200
Commit: Andras Timar
CommitDate: Wed Jul 29 10:15:48 2020 +0200
Center progressbar using css
Simplify progressbar code and center it using
css instead of JS code.
Change-Id: Ie5877dcbc0614b889f436cc598c7069fda135a3d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99633
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index ccf881de2..88ee4572a 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -814,7 +814,8 @@ input.clipboard {
.leaflet-progress-label {
text-align: center;
- }
+ font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+}
.leaflet-slideshow {
background: #FF;
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 2885dba2d..0d7d7e05a 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -37,6 +37,16 @@
z-index: 10;
cursor: auto;
}
+
+.leaflet-progress-layer
+{
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 1000;
+}
+
#document-container.text-doctype > #map{
cursor: text;
}
diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js
b/loleaflet/src/layer/marker/ProgressOverlay.js
index 090f8b078..fe6286279 100644
--- a/loleaflet/src/layer/marker/ProgressOverlay.js
+++ b/loleaflet/src/layer/marker/ProgressOverlay.js
@@ -10,8 +10,7 @@ L.ProgressOverlay = L.Layer.extend({
spinnerSpeed: 30
},
- initialize: function (latlng, size) {
- this._latlng = L.latLng(latlng);
+ initialize: function (size) {
this._size = size;
this._percent = 0;
this._initLayout();
@@ -19,18 +18,13 @@ L.ProgressOverlay = L.Layer.extend({
},
onAdd: function () {
- if (this._container) {
- this.getPane().appendChild(this._container);
- this.update();
- }
-
this._spinnerInterval =
L.LOUtil.startSpinner(this._spinnerCanvas, this.options.spinnerSpeed);
- this._map.on('moveend', this.update, this);
},
onRemove: function () {
if (this._container) {
- this.getPane().removeChild(this._container);
+
L.DomUtil.get('document-container').removeChild(this._container);
+ this._container = null;
}
if (this._spinnerInterval) {
@@ -38,18 +32,8 @@ L.ProgressOverlay = L.Layer.extend({
}
},
- update: function () {
- if (this._container && this._map) {
- var origin = new L.Point(0, 0);
- var paneOffset =
this._map.layerPointToContainerPoint(origin);
- var sizeOffset = this._size.divideBy(2, true);
- var position =
this._map.latLngToLayerPoint(this._latlng).round();
-
this._setPos(position.subtract(paneOffset).subtract(sizeOffset));
- }
- },
-
_initLayout: function () {
- this._container = L.DomUtil.create('div',
'leaflet-progress-layer');
+ this._container = L.DomUtil.create('div',
'leaflet-progress-layer', L.DomUtil.get('document-container'));
this._spinner = L.DomUtil.create('div',
'leaflet-progress-spinner', this._container);
this._spinnerCanvas = L.DomUtil.create('canvas',
'leaflet-progress-spinner-canvas', this._spinner);
@@ -72,10 +56,6 @@ L.ProgressOverlay = L.Layer.extend({
.disableScrollPropagation(this._container);
},
- _setPos: function (pos) {
- L.DomUtil.setPosition(this._container, pos);
- },
-
shutdownTimer: function() {
if (this.intervalTimer)
clearInterval(this.intervalTimer);
@@ -123,6 +103,10 @@ L.ProgressOverlay = L.Layer.extend({
if (map.hasLayer(this)) {
map.removeLayer(this);
}
+ if (this._container) {
+
L.DomUtil.get('document-container').removeChild(this._container);
+ this._container = null;
+ }
},
setLabel: function (label) {
@@ -147,6 +131,6 @@ L.ProgressOverlay = L.Layer.extend({
}
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/toolbar.css |2 +-
loleaflet/src/control/Control.DocumentNameInput.js |3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit e6face35a9de1152e19122adf417e17ffca2b210
Author: Pedro Pinto Silva
AuthorDate: Thu Jun 25 16:10:49 2020 +0200
Commit: Marco Cecchetti
CommitDate: Tue Jul 28 20:56:22 2020 +0200
Desktop: document name: center icon (pencil) & loading time
* be sure to wait from either the menu or the doc to appear to show the
icon by adding the "editable" class on after onDocLayerInit and onWopiProps
* remove if (this.UserCanNotWriteRelative === false) as at that moment we
still have no clue of its status
Change-Id: Icaaa921452b09d747be4fffab90bf1c93283718e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97128
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98647
Reviewed-by: Marco Cecchetti
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index ff228e7eb..604120e54 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -154,7 +154,7 @@ w2ui-toolbar {
width: 24px;
height: 18px;
position: absolute;
- left: 87%;
+ right: 10px;
background: url('images/baseline-edit.svg') right center no-repeat,
radial-gradient(circle, #fff 20%, #fff0 100%);
}
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index cfc4e5998..a01a974f1 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -11,6 +11,7 @@ L.Control.DocumentNameInput = L.Control.extend({
map.on('doclayerinit', this.onDocLayerInit, this);
map.on('wopiprops', this.onWopiProps, this);
+ $('#document-title-pencil').addClass('editable');
},
documentNameConfirm: function() {
@@ -100,12 +101,10 @@ L.Control.DocumentNameInput = L.Control.extend({
if (e.BaseFileName !== null)
// set the document name into the name field
$('#document-name-input').val(e.BreadcrumbDocName !==
undefined ? e.BreadcrumbDocName : e.BaseFileName);
-
if (e.UserCanNotWriteRelative === false) {
// Save As allowed
$('#document-name-input').prop('disabled', false);
$('#document-name-input').addClass('editable');
- $('#document-title-pencil').addClass('editable');
$('#document-name-input').off('keypress',
this.onDocumentNameKeyPress).on('keypress',
this.onDocumentNameKeyPress.bind(this));
$('#document-name-input').off('focus',
this.onDocumentNameFocus).on('focus', this.onDocumentNameFocus.bind(this));
$('#document-name-input').off('blur',
this.documentNameCancel).on('blur', this.documentNameCancel.bind(this));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/toolbar.css|1 -
loleaflet/src/control/Control.Menubar.js |2 +-
loleaflet/src/control/Control.Toolbar.js |5 +++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8055b2c4b035a7fd70a989bb1ad6cb1ad842443f
Author: Henry Castro
AuthorDate: Thu Jul 9 10:53:48 2020 -0400
Commit: Henry Castro
CommitDate: Wed Jul 15 14:37:14 2020 +0200
loleaflet: fix the show/hide close button
Explicit show/hide the close button if the page is loaded by
a WOPI Integrator.
Change-Id: I13d58bbbff03f283ed033a12a4489b610839748e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98443
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98798
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 0a795e187..ff228e7eb 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -230,7 +230,6 @@ td[id^=tb_editbar_item_sidebar]{
}
.closebuttonimage {
- display: none;
background: url('images/closedoc.svg') no-repeat center
!important;
}
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 3eea9a713..e1b76779a 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1360,7 +1360,7 @@ L.Control.Menubar = L.Control.extend({
if (menuItem.type === 'action') {
if ((menuItem.id === 'rev-history' &&
!L.Params.revHistoryEnabled) ||
- (menuItem.id === 'closedocument' &&
!window.closebutton) ||
+ (menuItem.id === 'closedocument' &&
!L.Params.closeButtonEnabled) ||
(menuItem.id === 'latest-updates' &&
!window.enableWelcomeMessage)) {
return false;
}
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 500ca36b5..6a52c4ec1 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1058,11 +1058,12 @@ function setupToolbar(e) {
map.on('commandresult', onCommandResult);
map.on('updateparts pagenumberchanged', onUpdateParts);
- if (!L.Params.closeButtonEnabled) {
+ if (map.options.wopi && L.Params.closeButtonEnabled) {
+ $('#closebuttonwrapper').show();
+ } else if (!L.Params.closeButtonEnabled) {
$('#closebuttonwrapper').hide();
} else if (L.Params.closeButtonEnabled && !window.mode.isMobile()) {
$('#closebuttonwrapper').show();
- $('.closebuttonimage').show();
}
$('#closebutton').click(function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css |2 +-
loleaflet/src/control/Control.PresentationBar.js |3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 349f7362b5bf3149906f5f6a355a260df1054dbc
Author: Pranam Lashkari
AuthorDate: Thu Jul 2 17:59:11 2020 +0530
Commit: Andras Timar
CommitDate: Sun Jul 5 21:09:07 2020 +0200
leaflet: removed slide controls from draw
Change-Id: I5916d829b257729363125643cf3ba548f7e4e9db
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97759
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
(cherry picked from commit 99944f8842e73a4207c230f895ac02ecba23cfd0)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97797
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index de1d246e1..03b13cd69 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -135,7 +135,7 @@ body {
}
#presentation-controls-wrapper.drawing {
- bottom: 40px; /* Hide the presentation toolbar (insert slide etc.) for
doctype = drawing */
+ bottom: 33px; /* Hide the presentation toolbar (insert slide etc.) for
doctype = drawing */
}
#presentation-controls-wrapper.readonly {
diff --git a/loleaflet/src/control/Control.PresentationBar.js
b/loleaflet/src/control/Control.PresentationBar.js
index eeb3cfac8..dd10369b0 100644
--- a/loleaflet/src/control/Control.PresentationBar.js
+++ b/loleaflet/src/control/Control.PresentationBar.js
@@ -10,6 +10,9 @@ L.Control.PresentationBar = L.Control.extend({
},
onAdd: function (map) {
+ if (this._map.getDocType() === 'drawing') {
+ return;
+ }
this.map = map;
this.create();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
