← Back to branch summary

~cairo-dock-team/ubuntu/precise/cairo-dock/988102

« back to all changes in this revision

Viewing changes to src/cairo-dock-default-view.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne
  • Date: 2008-11-13 22:04:19 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081113220419-091g450ognfgm0lo
Tags: 1.6.3.1-0ubuntu1
https://launchpad.net/bugs/297809
* New upstream release (LP: #297809).
* debian/cairo-dock-data.install:
 - Update to new upstream installation.
* debian/copyright
 - Update copyright of new files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cairo-dock-default-view.c
43
43
 
44
44
extern double g_fAmplitude;
45
45
extern CairoDockLabelDescription g_iconTextDescription;
46
 
extern cairo_surface_t *g_pDesktopBgSurface;
47
46
 
48
47
 
49
48
void cairo_dock_set_subdock_position_linear (Icon *pPointedIcon, CairoDock *pDock)
90
89
 
91
90
        pDock->iMinDockWidth = pDock->fFlatDockWidth + fExtraWidth;
92
91
        pDock->iMinDockHeight = pDock->iMaxIconHeight + 2 * g_iFrameMargin + 2 * g_iDockLineWidth;
 
92
        
 
93
        pDock->iMinLeftMargin = fExtraWidth/2;
 
94
        pDock->iMinRightMargin = fExtraWidth/2;
 
95
        Icon *pFirstIcon = cairo_dock_get_first_icon (pDock->icons);
 
96
        if (pFirstIcon != NULL)
 
97
                pDock->iMaxRightMargin = fExtraWidth/2 + pFirstIcon->fWidth;
 
98
        Icon *pLastIcon = cairo_dock_get_last_icon (pDock->icons);
 
99
        if (pLastIcon != NULL)
 
100
                pDock->iMaxRightMargin = fExtraWidth/2 + pLastIcon->fWidth;
93
101
}
94
102
 
95
103
 
193
201
                fDockOffsetY = pArea->y;
194
202
        }
195
203
 
196
 
        cairo_move_to (pCairoContext, fDockOffsetX, fDockOffsetY);
 
204
        //cairo_move_to (pCairoContext, fDockOffsetX, fDockOffsetY);
197
205
        if (pDock->bHorizontalDock)
198
206
                cairo_rectangle (pCairoContext, fDockOffsetX, fDockOffsetY, pArea->width, pDock->iDecorationsHeight);
199
207
        else