diff --git a/woof-code/rootfs-skeleton/usr/local/pup_event/frontend_funcs b/woof-code/rootfs-skeleton/usr/local/pup_event/frontend_funcs index c5a321a7277..c7d49c8bcdc 100755 --- a/woof-code/rootfs-skeleton/usr/local/pup_event/frontend_funcs +++ b/woof-code/rootfs-skeleton/usr/local/pup_event/frontend_funcs @@ -61,47 +61,8 @@ create_appinfo_func() { #needs INFO, DRV_CATEGORY, MOREITEMS, ONEDRVNAME } #v431 shinobar: fix for overlapping icons at some screen resolutions... -free_coord() { - #find a free place on desktop. v410 avoid exact overlapping icons... - #for left or right, i have flipped logic, so 'y' is horizontal... - COORDSGRID="`grep -o ' x="[0-9]*" y="[0-9]*" ' /root/Choices/ROX-Filer/PuppyPin | sed 's/[0-9]"/"/g'`" - case $ICON_PLACE_ORIENTATION in #091208 see /etc/eventmanager - bottom|right) - COORD_Y=`expr $SCRN_Y - $ICON_PLACE_EDGE_GAP` #091208 default 64, see /etc/eventmanager - ;; - *) #top or left - COORD_Y=$ICON_PLACE_EDGE_GAP - esac - # import from v4.20p1JP 5Jun09, 18aug09 by Masaki Shinomiya : snap on the grid - PIN_GRID_STEP=`grep "pinboard_grid_step" $HOME/.config/rox.sourceforge.net/ROX-Filer/Options | sed -e "s/ *<[^>]*>//g"` - if [ "$PIN_GRID_STEP" ] && [ $PIN_GRID_STEP -gt 0 ];then - PIN_GRID_STEP2=`expr $PIN_GRID_STEP / 2` - COORD_Y=`expr \( $COORD_Y + $PIN_GRID_STEP2 \) / $PIN_GRID_STEP '*' $PIN_GRID_STEP` - fi - COORD_X=$ICON_PLACE_START_GAP #091208 default 32, see /etc/eventmanager - MAX_X=`expr $SCRN_X - 96` - xPATTERN=" x=\"${COORD_X}\" y=\"${COORD_Y}\" " - xyCNT=0 #precaution. - while [ 1 ];do - xgPATTERN="`echo -n "$xPATTERN" | sed 's/[0-9]"/"/g'`" - [ "`echo "$COORDSGRID" | grep "$xgPATTERN"`" = "" ] && break - COORD_X=`expr $COORD_X + $ICON_PLACE_SPACING` #091208 - if [ $COORD_X -gt $MAX_X ];then #091208 start next line up. - xyCNT=`expr $xyCNT + 1` - [ $xyCNT -gt 1 ] && break - case $ICON_PLACE_ORIENTATION in #091208 see /etc/eventmanager - bottom) - COORD_Y=`expr $SCRN_Y - $ICON_PLACE_SPACING` - ;; - *) - COORD_Y=`expr $SCRN_Y + $ICON_PLACE_SPACING` - ;; - esac - COORD_X=$ICON_PLACE_START_GAP - fi - xPATTERN=" x=\"${COORD_X}\" y=\"${COORD_Y}\" " - done -} +#140304 deleted redundant free_coord function +#See http://murga-linux.com/puppy/viewtopic.php?p=762099#762099 free_coord() { #find a free place on desktop. v410 avoid exact overlapping icons...