← 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-opengl.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-opengl.c
45
45
#include "cairo-dock-draw.h"
46
46
#include "cairo-dock-notifications.h"
47
47
#include "cairo-dock-backends-manager.h"
48
 
#include "cairo-dock-internal-system.h"
49
48
#include "cairo-dock-internal-taskbar.h"
50
49
#include "cairo-dock-internal-labels.h"
51
50
#include "cairo-dock-internal-icons.h"
52
 
#include "cairo-dock-internal-background.h"
53
51
#include "cairo-dock-internal-accessibility.h"
54
52
#include "cairo-dock-log.h"
55
53
#include "cairo-dock-container.h"
413
411
        
414
412
        //\_____________________ On dessine les etiquettes, avec un alpha proportionnel au facteur d'echelle de leur icone.
415
413
        glPopMatrix ();  // retour au debut de la fonction.
416
 
        if (bUseText && icon->iLabelTexture != 0 && (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
 
414
        if (bUseText && icon->iLabelTexture != 0 &&
 
415
                ( (icon->fScale > 1.01 && (! myLabels.bLabelForPointedIconOnly || icon->bPointed)) ||
 
416
                ((myIcons.fAmplitude < 0.001 || pDock->fMagnitudeMax < 0.001) && icon->bPointed) ))  // 1.01 car sin(pi) = 1+epsilon :-/  //  && icon->iAnimationState < CAIRO_DOCK_STATE_CLICKED
417
417
        {
418
418
                glPushMatrix ();
419
419
                if (pDock->container.bIsHorizontal)
426
426
                        fOffsetX = icon->iTextWidth/2 - (icon->fDrawX + icon->fWidth * icon->fScale/2);
427
427
                else if (icon->fDrawX + icon->fWidth * icon->fScale/2 + icon->iTextWidth/2 > pDock->container.iWidth)
428
428
                        fOffsetX = pDock->container.iWidth - (icon->fDrawX + icon->fWidth * icon->fScale/2 + icon->iTextWidth/2);
429
 
                if (icon->fOrientation != 0 && ! mySystem.bTextAlwaysHorizontal)
 
429
                if (icon->fOrientation != 0 && ! myLabels.bTextAlwaysHorizontal)
430
430
                {
431
431
                        glTranslatef (-icon->fWidth * icon->fScale/2, icon->fHeight * icon->fScale/2, 0.);
432
432
                        glRotatef (-icon->fOrientation/G_PI*180., 0., 0., 1.);
435
435
                
436
436
                double dx = .5 * (icon->iTextWidth & 1);  // on decale la texture pour la coller sur la grille des coordonnees entieres.
437
437
                double dy = .5 * (icon->iTextHeight & 1);
438
 
                if (! pDock->container.bIsHorizontal && mySystem.bTextAlwaysHorizontal)
 
438
                if (! pDock->container.bIsHorizontal && myLabels.bTextAlwaysHorizontal)
439
439
                {
440
440
                        fOffsetX = MIN (0, icon->fDrawY + icon->fWidth * icon->fScale/2 - icon->iTextWidth/2);
441
441
                        double y = (icon->fWidth * icon->fScale + icon->iTextHeight) / 2;
467
467
                else
468
468
                {
469
469
                        fMagnitude = (icon->fScale - 1) / myIcons.fAmplitude;  /// il faudrait diviser par pDock->fMagnitudeMax ...
470
 
                        fMagnitude = pow (fMagnitude, mySystem.fLabelAlphaThreshold);
471
 
                        ///fMagnitude *= (fMagnitude * mySystem.fLabelAlphaThreshold + 1) / (mySystem.fLabelAlphaThreshold + 1);
 
470
                        fMagnitude = pow (fMagnitude, myLabels.fLabelAlphaThreshold);
 
471
                        ///fMagnitude *= (fMagnitude * myLabels.fLabelAlphaThreshold + 1) / (myLabels.fLabelAlphaThreshold + 1);
472
472
                }
473
473
                
474
474
                _cairo_dock_enable_texture ();
496
496
        {
497
497
                _cairo_dock_enable_texture ();
498
498
                _cairo_dock_set_blend_over ();
499
 
                //_cairo_dock_set_alpha (myBackground.fVisibleZoneAlpha);
500
499
                int w = MIN (myAccessibility.iZoneWidth, pDock->container.iWidth);
501
500
                int h = MIN (myAccessibility.iZoneHeight, pDock->container.iHeight);
502
501
                cd_debug ("%s (%dx%d)", __func__, w, h);
518
517
                
519
518
                if (! pDock->container.bIsHorizontal)
520
519
                        glRotatef (90., 0, 0, 1);
521
 
                if (! pDock->container.bDirectionUp && /**myBackground.bReverseVisibleImage*/TRUE)
 
520
                if (! pDock->container.bDirectionUp)  // reverse image with dock.
522
521
                        glScalef (1., -1., 1.);
523
522
                
524
523
                _cairo_dock_apply_texture_at_size (g_pVisibleZoneBuffer.iTexture, w, h);