Просмотр исходного кода

Ticket #4217 - More popup shouldn't be cut off.

AntonLV 3 лет назад
Родитель
Сommit
8ccf195744

+ 4 - 0
modules/boonex/artificer/data/template/system/css/common.css

@@ -79,6 +79,10 @@ import url(../../../../../../../template/css/common.css);
 .bx-db-menu-tab {
     margin-left: 5px;
     text-align: right;
+    overflow-x: auto;
+}
+.bx-db-menu-tab.bx-db-menu-tab-more-auto {
+    overflow-x: visible;
 }
 
 .bx-db-menu-tab .bx-menu-custom-hor:not(.bx-menu-more-auto) {

+ 4 - 1
template/css/common.css

@@ -221,12 +221,15 @@ blockquote {
 .bx-db-menu-tab {
     margin-left: 5px;
     text-align: right;
+    overflow-x: auto;
+}
+.bx-db-menu-tab.bx-db-menu-tab-more-auto {
+    overflow-x: visible;
 }
 
 .bx-db-menu-tab .bx-menu-custom-hor:not(.bx-menu-more-auto) {
     width: max-content;
 }
-
 .bx-db-menu-tab-active {
     text-decoration:underline;
 }

+ 1 - 1
template/designbox_menu.html

@@ -1,3 +1,3 @@
 <div class="bx-db-menu">
-    <div class="bx-db-menu-tab bx-db-menu-tab-btn overflow-x-auto">__content__</div>
+    <div class="bx-db-menu-tab bx-db-menu-tab-btn__class__">__content__</div>
 </div>

+ 4 - 1
template/scripts/BxBaseFunctions.php

@@ -375,7 +375,7 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
     {
         $bUseTabs = is_bool($mixedButtons) && $mixedButtons === true;
 
-        $sMenu = '';
+        $sClass = $sMenu = '';
         if(!empty($mixedMenu)) {
             if(is_string($mixedMenu)) {
                 if(($oMenu = BxTemplMenu::getObjectInstance($mixedMenu)) !== false) {
@@ -402,6 +402,8 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
             }
             else if(is_object($mixedMenu) && is_a($mixedMenu, 'BxTemplMenu')) {
                 $mixedMenu->setTemplateById($bUseTabs ? BX_DB_MENU_TEMPLATE_TABS : BX_DB_MENU_TEMPLATE_POPUP);
+                if(($mixedMenu instanceof BxBaseMenuMoreAuto) && $mixedMenu->isMoreAuto())
+                    $sClass = ' bx-db-menu-tab-more-auto';
 
                 $sMenu = $mixedMenu->getCode();
             }
@@ -484,6 +486,7 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
 
         if(!empty($sResult))
             $sResult = $this->_oTemplate->parseHtmlByName('designbox_menu.html', array(
+                'class' => $sClass,
                 'content' => $sResult
             ));
 

+ 5 - 0
template/scripts/BxBaseMenuMoreAuto.php

@@ -66,6 +66,11 @@ class BxBaseMenuMoreAuto extends BxTemplMenu
         return $sResult;
     }
 
+    public function isMoreAuto()
+    {
+        return $this->_isMoreAuto();
+    }
+
     protected function _isMoreAuto()
     {
         if(is_bool($this->_bMoreAuto))