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

[Ashod Nakashian (via logerrit)]

 loleaflet/css/selectionMarkers.css            |   14 ++------------
 loleaflet/src/control/Control.MobileWizard.js |    7 ++++++-
 2 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit d97542209fa611c8f41a2d003c93039d100f2ec4
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Wed Mar 25 08:17:35 2020 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Mar 26 17:58:30 2020 +0100

    Revert "Desktop: Calc: formular bar: Decrease size of selection..."
    
    The commit in question breaks clicking into the Formula-Bar.
    With that commit, the Formula-Bar doesn't take focus upon clicking
    most of the time, and only rarely does so (possibly depending on
    the precise location of the click).
    
    This reverts commit b906c6985ab0c9478699a409eb4974cfb1e30d2e.
    
    Change-Id: I2ff6b531b479c265935cbc44af4d2cbbaa7c418b
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91050
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91133
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/css/selectionMarkers.css b/loleaflet/css/selectionMarkers.css
index 9eecb6b25..9d2af07d6 100644
--- a/loleaflet/css/selectionMarkers.css
+++ b/loleaflet/css/selectionMarkers.css
@@ -23,18 +23,8 @@
 .inputbar_selection_handles * {
 	z-index: 1;
 }
- at media (min-width: 1024px) and (pointer: fine) {
-	#tb_formulabar_item_formula .inputbar_selection_handles{
-		top:-12px;
-	}
-	#tb_formulabar_item_formula .inputbar_selection_handles *{
-		background-size: 20px;
-		background-repeat: no-repeat;
-		background-position-x: 3px;
-	}
-	#tb_formulabar_item_formula .inputbar_selection_handles .leaflet-selection-marker-start{
-		background-position-x: 8px;
-	}
+#tb_formulabar_item_formula .inputbar_selection_handles{
+	/*display: none;*/
 }
 @media (max-width: 767px), (max-device-height: 767px) and (pointer: coarse) {
 	#tb_formulabar_item_formula, #tb_formulabar_item_address {
commit 5dcc1e42d0a4433bcdbb8fe913d368ce8c2ed527
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Tue Mar 24 18:30:06 2020 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Mar 26 17:58:16 2020 +0100

    leaflet: allow keyboard with Calc MobileWizard
    
    This is to facilitate searching for a formula,
    which is shown as a list via the Mobile Wizard.
    
    Change-Id: If4ae2dfbce1c9cf153354d1c3a2ff7a8f4af3ea2
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91020
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91132
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index e18b8ccdf..1f10b1a60 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -317,7 +317,12 @@ L.Control.MobileWizard = L.Control.extend({
 			else mWizardContentLength = data.children[0].children.length;
 
 			this._showWizard(mWizardContentLength);
-			this._hideKeyboard();
+			if (!this._map._docLayer.isCalc()) {
+				// In Calc, the wizard is used for the formulas,
+				// and it's easier to allow the user to search
+				// for a formula by typing the first few characters.
+				this._hideKeyboard();
+			}
 
 			// Morph the sidebar into something prettier
 			if (isSidebar)