Changeset 30224 for extensions/LLGBO2

Timestamp:

Oct 19, 2014, 7:23:31 PM (10 years ago)

Author:

gbo

Message:

improve frame size when using zoom in browser -> ctrl +/-

Location:

extensions/LLGBO2

Files:

• include/manage_picture_content.php (modified) (3 diffs)
• js/jquery_llgboframeresize.js (modified) (2 diffs)
• main.inc.php (modified) (4 diffs)

extensions/LLGBO2/include/manage_picture_content.php

@@ -76 +76 @@
                                 $frame_title =  "\n".'<!-- Begin LLGBO -->'."\n".'<span  id="llgboh2" style ="background:transparent;z-index:3;color:'.$conf['LLGBO2']['FR-titlecolor'].'">';   
                                 }
-                        
+                                
                         $template->append('llgbo', array(   
                                                         'FRAME_TITLE1' => $frame_title,
@@ -86 +86 @@
                                                          
                         $template->set_prefilter('default_content', 'LLGBO_prefilter_Content_Frame');           
-
-                if (isset($conf['automatic_size_width_margin'])) // auto size  must take care of frame size
-                        { $template->assign( array(
-                        'asize_width_margin' => $conf['automatic_size_width_margin'] + $frame_border,
-                        'asize_height_margin' => $conf['automatic_size_height_margin'] + $frame_border,));
-                        $template->parse('asize_picture_js');}  
         } // end frame                                  
 //----------------------------------------------------   
@@ -128 +122 @@
         return $content;
 }
+
 ?>

extensions/LLGBO2/js/jquery_llgboframeresize.js

@@ -6 +6 @@
                          {      var MainImg = jQuery("#theMainImage");
                                 if (MainImg.size() > 0)
-                                   {    var nImgH = parseInt(MainImg.height() ); 
-                                                var nImgW = parseInt(MainImg.width() );
+                                   {   var nImgH = parseFloat(MainImg.height() ); 
+                                                var nImgW = parseFloat(MainImg.width() );
                                                 var FrLstBdr = 0; var frbdr=0;
                                                 jQuery(".llgboFR").each(function(){ 
-                                                        frbdr = parseInt(jQuery(this).css('border-top-width'));
+                                                        frbdr = parseFloat(jQuery(this).css('border-top-width')); 
                                                         FrLstBdr = (frbdr * 2)+FrLstBdr; 
                                                         });
-                                        }               
+                                        }                                               
                                 Elmgbo.width (nImgW + FrLstBdr) ;
                                 Elmgbo.height (nImgH + FrLstBdr) ; 
+                                                
+                                                
                         }       
                 }
@@ -24 +26 @@
                                 LlgboFr_Resize(); });
                         
-                jQuery("#theMainImage").load(function(){
+                jQuery("#theMainImage").load(function(){ ;
                                 LlgboFr_Resize();});
  });

extensions/LLGBO2/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Look_like_gbo2 
-Version:  2.7.D
+Version:  2.7.E
 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=251
 Author: GBo 
@@ -17 +17 @@
                 2.7.D fix bug with frame and theme P0w0
                         improve compatibility with Automatic Size       
+                2.7.E fix bug with frame in js resize 
  */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
@@ -23 +24 @@
 // | Plugin constants                                               |
 // +-----------------------------------------------------------------------+
-define('LLGBO_VERSION', '2.7.D');
+define('LLGBO_VERSION', '2.7.E');
 define('LLGBO_ID',       basename(dirname(__FILE__)));
 define('LLGBO_PATH' ,    PHPWG_PLUGINS_PATH . LLGBO_ID . '/');
@@ -47 +48 @@
         
     $conf['LLGBO2'] =  safe_unserialize($conf['LLGBO2_Settings']);
+        
+        // auto size  must take care of frame size
+        if (($conf['LLGBO2']['frame']) ) //Frame on
+        {       $framesize =0;          
+            foreach ($conf['LLGBO2']['FR-sizes'] as $cle  => $value) 
+                        { if ( $value > 0)
+                                {       $framesize = $framesize + ( 2 * $value);        } 
+                        }
+                if (defined('ASIZE_PATH')) 
+                        { $conf['automatic_size_width_margin']= 12 + $framesize;
+                          $conf['automatic_size_height_margin']= 40 + $framesize;
+                        }
+        }
 } 
 /******************************************************************/