← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cairo-dock/oneiric

« back to all changes in this revision

Viewing changes to src/gldit/cairo-dock-draw.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-09-07 20:31:25 UTC
  • mto: (18.1.1 cairo-dock) (19.1.1 cairo-dock)
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: james.westby@ubuntu.com-20100907203125-a91ch8odv2r6ziic
Tags: upstream-2.2.0~0rc1
Import upstream version 2.2.0~0rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-draw.c
43
43
#include "cairo-dock-internal-indicators.h"
44
44
#include "cairo-dock-internal-labels.h"
45
45
#include "cairo-dock-internal-icons.h"
46
 
#include "cairo-dock-internal-background.h"
47
46
#include "cairo-dock-internal-accessibility.h"
48
47
#include "cairo-dock-notifications.h"
49
48
#include "cairo-dock-backends-manager.h"
316
315
        
317
316
        if (pDock->container.bIsHorizontal)
318
317
        {
319
 
                cairo_translate (pCairoContext, /**pDock->fDecorationsOffsetX * myBackground.fDecorationSpeed */fOffsetX, fOffsetY);
 
318
                cairo_translate (pCairoContext, fOffsetX, fOffsetY);
320
319
                cairo_scale (pCairoContext, (double)fWidth / pDock->backgroundBuffer.iWidth, (double)pDock->iDecorationsHeight / pDock->backgroundBuffer.iHeight);  // pDock->container.iWidth
321
320
        }
322
321
        else
323
322
        {
324
 
                cairo_translate (pCairoContext, fOffsetY, /**pDock->fDecorationsOffsetX * myBackground.fDecorationSpeed + */fOffsetX);
 
323
                cairo_translate (pCairoContext, fOffsetY, fOffsetX);
325
324
                cairo_scale (pCairoContext, (double)pDock->iDecorationsHeight / pDock->backgroundBuffer.iHeight, (double)fWidth / pDock->backgroundBuffer.iWidth);
326
325
        }
327
326
        
560
559
        cairo_restore (pCairoContext);  // retour juste apres la translation (fDrawX, fDrawY).
561
560
        
562
561
        //\_____________________ On dessine les etiquettes, avec un alpha proportionnel au facteur d'echelle de leur icone.
563
 
        if (bUseText && icon->pTextBuffer != NULL && (icon->fScale > 1.01 || myIcons.fAmplitude == 0 || pDock->fMagnitudeMax == 0) && (! myLabels.bLabelForPointedIconOnly || icon->bPointed))  // 1.01 car sin(pi) = 1+epsilon :-/  //  && icon->iAnimationState < CAIRO_DOCK_STATE_CLICKED
 
562
        if (bUseText && icon->pTextBuffer != NULL &&
 
563
                ( (icon->fScale > 1.01 && (! myLabels.bLabelForPointedIconOnly || icon->bPointed)) ||
 
564
                ((myIcons.fAmplitude < 0.001 || pDock->fMagnitudeMax < 0.001) && icon->bPointed) ))  // 1.01 car sin(pi) = 1+epsilon :-/  //  && icon->iAnimationState < CAIRO_DOCK_STATE_CLICKED
564
565
        {
565
566
                cairo_save (pCairoContext);
566
567
                
576
577
                else if (icon->fDrawX + fOffsetX + icon->iTextWidth > iWidth)
577
578
                        fOffsetX = iWidth - icon->iTextWidth - icon->fDrawX;
578
579
                
579
 
                if (icon->fOrientation != 0 && ! mySystem.bTextAlwaysHorizontal)
 
580
                if (icon->fOrientation != 0 && ! myLabels.bTextAlwaysHorizontal)
580
581
                        cairo_rotate (pCairoContext, icon->fOrientation);
581
582
                
582
 
                if (! bIsHorizontal && mySystem.bTextAlwaysHorizontal)
 
583
                if (! bIsHorizontal && myLabels.bTextAlwaysHorizontal)
583
584
                {
584
585
                        if (fOffsetX < - icon->fDrawY)
585
586
                                fOffsetX = - icon->fDrawY;
612
613
                else
613
614
                {
614
615
                        fMagnitude = (icon->fScale - 1) / myIcons.fAmplitude;  /// il faudrait diviser par pDock->fMagnitudeMax ...
615
 
                        fMagnitude = pow (fMagnitude, mySystem.fLabelAlphaThreshold);
616
 
                        ///fMagnitude *= (fMagnitude * mySystem.fLabelAlphaThreshold + 1) / (mySystem.fLabelAlphaThreshold + 1);
 
616
                        fMagnitude = pow (fMagnitude, myLabels.fLabelAlphaThreshold);
 
617
                        ///fMagnitude *= (fMagnitude * myLabels.fLabelAlphaThreshold + 1) / (myLabels.fLabelAlphaThreshold + 1);
617
618
                }
618
619
                if (fMagnitude > .1)
619
620
                        cairo_paint_with_alpha (pCairoContext, fMagnitude);
948
949
                cairo_dock_draw_surface (pCairoContext, g_pVisibleZoneBuffer.pSurface,
949
950
                        w,
950
951
                        h,
951
 
                        (TRUE/**myBackground.bReverseVisibleImage*/ ? pDock->container.bDirectionUp : TRUE),
 
952
                        pDock->container.bDirectionUp,  // reverse image with dock.
952
953
                        pDock->container.bIsHorizontal,
953
 
                        1./**myBackground.fVisibleZoneAlpha*/);
 
954
                        1.);
954
955
                cairo_restore (pCairoContext);
955
956
        }
956
957