← Back to branch summary

~cairo-dock-team/cairo-dock-core/popup_from_shortkey

« back to all changes in this revision

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

  • Committer: Fabrice Rey
  • Date: 2013-06-04 22:58:28 UTC
  • Revision ID: fabounet03@gmail.com-20130604225828-x8lg3mv9135jr114
updated various parts of the core to the new API (new icons type, 'delete' method, simplified functions, etc)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-draw-opengl.c
25
25
#include "cairo-dock-dock-facility.h"  // cairo_dock_get_first_drawn_element_linear
26
26
#include "cairo-dock-applications-manager.h"  // myTaskbarParam.fVisibleAppliAlpha
27
27
#include "cairo-dock-windows-manager.h"
 
28
#include "cairo-dock-separator-manager.h"
 
29
#include "cairo-dock-applet-manager.h"
28
30
#include "cairo-dock-dock-manager.h"
29
31
#include "cairo-dock-animations.h"
30
32
#include "cairo-dock-overlay.h"
115
117
                }
116
118
                glPushMatrix ();
117
119
                double x0, y0, x1, y1;
118
 
                double fScale = ((myIconsParam.bConstantSeparatorSize && CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pIcon)) ? 1. : pIcon->fScale);
 
120
                double fScale = ((myIconsParam.bConstantSeparatorSize && GLDI_OBJECT_IS_SEPARATOR_ICON (pIcon)) ? 1. : pIcon->fScale);
119
121
                ///double fReflectSize = MIN (myIconsParam.fReflectSize, pIcon->fHeight/pDock->container.fRatio*fScale);
120
122
                double fReflectSize = pIcon->fHeight * myIconsParam.fReflectHeightRatio * fScale;
121
123
                ///double fReflectRatio = fReflectSize * pDock->container.fRatio / pIcon->fHeight / fScale  / pIcon->fHeightFactor;
314
316
                        pDock->container.bIsHorizontal ? 48:1);
315
317
                cd_debug ("g_pGradationTexture(%d) <- %d", pDock->container.bIsHorizontal, g_pGradationTexture[pDock->container.bIsHorizontal]);
316
318
        }
317
 
        if (CAIRO_DOCK_IS_APPLI (icon) && myTaskbarParam.fVisibleAppliAlpha != 0 && ! CAIRO_DOCK_ICON_TYPE_IS_APPLET (icon) && !(myTaskbarParam.iMinimizedWindowRenderType == 1 && icon->pAppli->bIsHidden))
 
319
        if (CAIRO_DOCK_IS_APPLI (icon) && myTaskbarParam.fVisibleAppliAlpha != 0 && ! GLDI_OBJECT_IS_APPLET_ICON (icon) && !(myTaskbarParam.iMinimizedWindowRenderType == 1 && icon->pAppli->bIsHidden))
318
320
        {
319
321
                double fAlpha = (icon->pAppli->bIsHidden ? MIN (1 - myTaskbarParam.fVisibleAppliAlpha, 1) : MIN (myTaskbarParam.fVisibleAppliAlpha + 1, 1));
320
322
                if (fAlpha != 1)
333
335
        
334
336
        //\_____________________ On positionne l'icone.
335
337
        glPushMatrix ();
336
 
        if (myIconsParam.bConstantSeparatorSize && CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))
 
338
        if (myIconsParam.bConstantSeparatorSize && GLDI_OBJECT_IS_SEPARATOR_ICON (icon))
337
339
        {
338
340
                if (pDock->container.bIsHorizontal)
339
341
                {
350
352
                glRotatef (-icon->fOrientation/G_PI*180., 0., 0., 1.);
351
353
                glTranslatef (icon->fWidth * icon->fScale/2, -icon->fHeight * icon->fScale/2, 0.);
352
354
        }
353
 
        if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon) && myIconsParam.bRevolveSeparator)
 
355
        if (GLDI_OBJECT_IS_SEPARATOR_ICON (icon) && myIconsParam.bRevolveSeparator)
354
356
        {
355
357
                if (pDock->container.bIsHorizontal)
356
358
                {
380
382
        
381
383
        glPopMatrix ();  // retour juste apres la translation au milieu de l'icone.
382
384
        
383
 
        if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon) && myIconsParam.bRevolveSeparator && !pDock->container.bIsHorizontal)
 
385
        if (GLDI_OBJECT_IS_SEPARATOR_ICON (icon) && myIconsParam.bRevolveSeparator && !pDock->container.bIsHorizontal)
384
386
        {
385
387
                glMatrixMode(GL_TEXTURE);
386
388
                glLoadIdentity ();