← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cairo-dock-plug-ins/oneiric-updates

« back to all changes in this revision

Viewing changes to dock-rendering/src/rendering-parabole.c

  • Committer: Kees Cook
  • Date: 2011-08-11 23:17:39 UTC
  • mfrom: (20.1.1 cairo-dock-plug-ins)
  • Revision ID: kees@outflux.net-20110811231739-cteedan51tmdg77v
Tags: 2.4.0~0beta2-0ubuntu1
releasing version 2.4.0~0beta2-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
dock-rendering/src/rendering-parabole.c
90
90
                }
91
91
                //cd_debug ("recalage : %.2f (%d)\n", -iMouseX + pPointedIcon->fDrawX + pPointedIcon->fWidth * pPointedIcon->fScale / 2, pSubDock->iMaxLabelWidth);
92
92
                pSubDock->fAlign = 0;
93
 
                pSubDock->iGapY = (pDock->iGapY + pDock->iMaxDockHeight);
 
93
                pSubDock->iGapY = (pDock->iGapY + pDock->iActiveHeight);
94
94
                pSubDock->iGapX = iX + pDock->container.iWindowPositionX - (pDock->container.bIsHorizontal ? pDock->iScreenOffsetX : pDock->iScreenOffsetY) - pSubDock->iMaxLabelWidth;
95
95
        }
96
96
        else
103
103
                        iX += icon->fWidth + (pPointedIcon->fWidth * pPointedIcon->fScale - icon->fWidth) / 2;
104
104
                }
105
105
                pSubDock->fAlign = 1;
106
 
                pSubDock->iGapY = (pDock->iGapY + pDock->iMaxDockHeight);
 
106
                pSubDock->iGapY = (pDock->iGapY + pDock->iActiveHeight);
107
107
                pSubDock->iGapX =  pDock->container.iWindowPositionX - (pDock->container.bIsHorizontal ? pDock->iScreenOffsetX : pDock->iScreenOffsetY) + iX - g_desktopGeometry.iScreenWidth[pDock->container.bIsHorizontal] + pSubDock->iMaxLabelWidth;
108
108
                
109
109
        }
323
323
        
324
324
        pDock->iMinDockWidth = pDock->fFlatDockWidth;
325
325
        pDock->iMinDockHeight = pDock->iMaxIconHeight;
 
326
        
 
327
        pDock->iActiveWidth = pDock->iMaxDockWidth;
 
328
        pDock->iActiveHeight = pDock->iMaxDockHeight;
326
329
}
327
330
 
328
331