wait #6756 @3

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index 6fc5a6f27300d5adc4bba144596354660cc58f72..a38f839060b5376e812e35f82b6fab900ed9d39f 100644 (file)
--- a/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@ -1774,6 +1774,10 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
         // General theme
         $cssWidth = $this->cssWidth;
         $cssHeight = $this->cssHeight;
+        if($this->isOnePage() && !$this->isMobileFirst() && $this->fluidbookSettings->fixAirPixel){
+            $cssWidth-=2;
+            $cssHeight-=2;
+        }
         $cssScale = $this->cssScale;
         $w2 = ($cssWidth * 2) . 'px';
         $h = $cssHeight . 'px';
@@ -1790,11 +1794,9 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
         $this->lessVariables['z'] = $this->z;
         $this->lessVariables['book-page-width'] = $w;
 
-
         $this->lessVariables['book-page-correct-width'] = $w;
         $this->lessVariables['book-page-correct-height'] = $h;
 
-
         $this->log('CSS 2');
         $this->lessVariables['book-page-height'] = $h;
         $this->lessVariables['book-page-ratio'] = floatval($w) / floatval($h);

diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php
index a430e2f35ed3b4c977ed7837d9e05c84444d139e..105abc5ddf3f36e1b4ff6760ed4adad19026b5c8 100644 (file)
--- a/app/Models/Traits/PublicationSettings.php
+++ b/app/Models/Traits/PublicationSettings.php
@@ -449,7 +449,12 @@ trait PublicationSettings
         $this->addSettingField('correctCenter', Checkbox::class, $this->__('Corriger les lignes blanches entre les pages'), [
             'v2' => '{"type":"boolean","default":true,"editable":true,"label":"\\u00a7!\\u00a7Corriger les lignes blanches entre les pages!\\u00a7!","grade":2}',
             'default' => true,
+            'when' => ['mobileNavigationType' => ['book', 'landscape']],
         ]);
+
+        $this->addSettingField('fixAirPixel', Checkbox::class, $this->__('Corriger la ligne blanche en bordure de page'),
+            ['default' => true, 'when' => ['mobileNavigationType' => ['portrait']]]
+        );
 //        $this->addSettingField('pagesBaseAngle', Integer::class, $this->__('Angle de base entre les pages'), [
 //            'v2' => '{"type":"integer","default":2,"editable":false,"label":"\\u00a7!\\u00a7Angle de base entre les pages!\\u00a7!","grade":3,"hint":"\\u00a7!\\u00a70 : Publication \\u00e0 plat!\\u00a7!\\n\\u00a7!\\u00a72 : Valeur par d\\u00e9faut!\\u00a7!"}',
 //            'hint' => $this->__('0 : Publication à plat') . '
@@ -459,6 +464,7 @@ trait PublicationSettings
         $this->addSettingField('centerBook', Checkbox::class, $this->__('Centrer la publication sur les couvertures'), [
             'v2' => '{"type":"boolean","default":true,"editable":true,"label":"\\u00a7!\\u00a7Centrer la publication sur les couvertures!\\u00a7!","grade":2}',
             'default' => true,
+            'when' => ['mobileNavigationType' => ['book', 'landscape']],
         ]);
         $this->addSettingField('', FormSeparator::class);
         $this->addSettingField('mobileReducedMargins', Checkbox::class, $this->__('Marges réduites sur mobile'), [

diff --git a/composer.lock b/composer.lock
index 7c5897696cc953e0129121a94f6f70d43c8beae1..e25ef99dfcd6cdacdd6dd91d21edad0a78a16de0 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -3834,13 +3834,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/fluidbook_tools.git",
-                "reference": "cb1a0eff50b88ac0990b10be151c879e69ee5388"
+                "reference": "e82521ac311c9600c85f88d5f1ed276f8efc5eb4"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-f226b4.tar",
-                "reference": "cb1a0eff50b88ac0990b10be151c879e69ee5388",
-                "shasum": "3ca0c456cfad34b9b882f2d508ad643f00e7b3cb"
+                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-9be628.tar",
+                "reference": "e82521ac311c9600c85f88d5f1ed276f8efc5eb4",
+                "shasum": "767b37ef9036e7665de529b615ac78ddf0c083be"
             },
             "require": {
                 "barryvdh/laravel-debugbar": "*",
@@ -3876,7 +3876,7 @@
                 }
             ],
             "description": "Fluidbook Tools",
-            "time": "2024-02-27T11:03:45+00:00"
+            "time": "2024-02-27T11:27:01+00:00"
         },
         {
             "name": "fruitcake/php-cors",