← Back to branch summary

~ubuntu-branches/ubuntu/quantal/cairo-dock-plug-ins/quantal-201208191523

« back to all changes in this revision

Viewing changes to Scooby-Do/src/applet-draw.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-08-10 00:05:57 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100810000557-pfxoz5w7hbyclcqh
Tags: 2.2.0~0beta4-0ubuntu1
https://launchpad.net/bugs/614625
https://launchpad.net/bugs/483963
https://launchpad.net/bugs/485159
https://launchpad.net/bugs/500677
https://launchpad.net/bugs/500979
https://launchpad.net/bugs/521531
https://launchpad.net/bugs/519915
https://launchpad.net/bugs/526138
https://launchpad.net/bugs/531317
https://launchpad.net/bugs/531319
https://launchpad.net/bugs/537115
https://launchpad.net/bugs/537943
https://launchpad.net/bugs/538637
* New Upstream Version (LP: #614625)
* Fixed a few bugs on LP:
 - LP: #483963: Dustbin applet does not display trashes on all volumes
 - LP: #485159: Some apps have problem with Systray
 - LP: #500677: ~/.xsession-errors is too much used by CD
 - LP: #500979: Shortcuts: the order gets messed up
 - LP: #521531: Mail: crashes on Maildir
 - LP: #519915: GTG: create a new applet to control GTG
 - LP: #526138: GMenu doesn't handle desktop file exec strings properly
 - LP: #531317: CMake: Added an error if the prefix of 'cairo-dock-plugins'
                 is not the same 'cairo-dock-core'
 - LP: #531319: CMake: check the version of 'cairo-dock' when building
                 'cairo-dock-plugins'
 - LP: #537115: Click at the position where icon lavel was, the icon
                 and dock still receive the event
 - LP: #537943: Terminal applet shortkey behaviour
 - LP: #538637: Trash applet doesn't create .trashinfo files on XFCE
 - More details on the 'ChangeLog' file
* debian/rules:
 - Autotools has been replaced by CMake
 - cdbs is now used.
* debian/copyright:
 - Updated with the new applets
* debian/control:
 - Autotools has been replaced by CMake
 - Added libcurl4-gnutls-dev, libindicator-dev, libdbusmenu-glib-dev
   libido-0.1-dev, libical-dev, libdbusmenu-gtk-dev as Build-deps
 - Bump Standard-Version to 3.9.1
 - Wget is required for dnd2share applet
 - Added the exact realease for 'cairo-dock-dev' in order to prevent any
    build error if this package is not already available (thx to didrocks)
* debian/cairo-dock-plug-ins*.install:
 - All sonames are now installed into lib32 or lib64 (lib*)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Scooby-Do/src/applet-draw.c
360
360
                        glPushMatrix ();
361
361
                        if (! pMainDock->container.bIsHorizontal)
362
362
                                glRotatef (pMainDock->container.bDirectionUp ? 90. : -90., 0., 0., 1.);
363
 
                        cairo_dock_draw_rounded_rectangle_opengl (fRadius, fLineWidth, fFrameWidth, fFrameHeight, fDockOffsetX, fDockOffsetY, fFrameColor);
 
363
                        glTranslatef (fDockOffsetX, fDockOffsetY, 0.);
 
364
                        cairo_dock_draw_rounded_rectangle_opengl (fFrameWidth, fFrameHeight, fRadius, fLineWidth, fFrameColor);
364
365
                        glPopMatrix ();
365
366
                        
366
367
                        // on les dessine.
431
432
                                        _cairo_dock_disable_texture ();
432
433
                                        fLineWidth = 4.;
433
434
                                        double fFrameColor[4] = {myConfig.pFrameColor[0]+.1, myConfig.pFrameColor[1]+.1, myConfig.pFrameColor[2]+.1, 1.};
434
 
                                        cairo_dock_draw_rounded_rectangle_opengl (fRadius, fLineWidth, iWidth * fZoom * fIconScale - fLineWidth, iHeight * fZoom * fIconScale - fLineWidth, -iWidth/2 * fZoom * fIconScale + fLineWidth/2, iHeight * fZoom/2 * fIconScale - fLineWidth/2, fFrameColor);
 
435
                                        glTranslatef (iWidth/2 * fZoom * fIconScale + fLineWidth/2, iHeight * fZoom/2 * fIconScale - fLineWidth/2, 0.);
 
436
                                        cairo_dock_draw_rounded_rectangle_opengl (iWidth * fZoom * fIconScale - fLineWidth,
 
437
                                                iHeight * fZoom * fIconScale - fLineWidth,
 
438
                                                fRadius,
 
439
                                                fLineWidth,
 
440
                                                fFrameColor);
435
441
                                        _cairo_dock_enable_texture ();
436
442
                                        _cairo_dock_set_blend_alpha ();
437
443
                                }
459
465
                
460
466
                if (! pMainDock->container.bIsHorizontal)
461
467
                        glRotatef (pMainDock->container.bDirectionUp ? 90. : -90., 0., 0., 1.);
462
 
                cairo_dock_draw_rounded_rectangle_opengl (fRadius, 0, fFrameWidth, fFrameHeight, fDockOffsetX, fDockOffsetY, fFrameColor);
 
468
                glTranslatef (fDockOffsetX, fDockOffsetY, 0.);
 
469
                cairo_dock_draw_rounded_rectangle_opengl (fFrameWidth, fFrameHeight, fRadius, 0, fFrameColor);
463
470
                glPopMatrix();
464
471
                
465
472
                // dessin des lettres.
467
474
                _cairo_dock_set_blend_alpha ();
468
475
                _cairo_dock_set_alpha (fAlpha);
469
476
                
 
477
                cairo_dock_set_perspective_view (CAIRO_CONTAINER (pMainDock));
470
478
                if (pMainDock->container.bIsHorizontal)
471
479
                {
472
 
                        cairo_dock_set_perspective_view (pMainDock->container.iWidth, pMainDock->container.iHeight);
473
480
                        glTranslatef (-pMainDock->container.iWidth/2, -pMainDock->container.iHeight/2, 0.);
474
481
                }
475
482
                else
476
483
                {
477
 
                        cairo_dock_set_perspective_view (pMainDock->container.iHeight, pMainDock->container.iWidth);
478
484
                        glTranslatef (-pMainDock->container.iHeight/2, -pMainDock->container.iWidth/2, 0.);
479
485
                }
480
486
                glEnable (GL_DEPTH_TEST);
558
564
                        
559
565
                        glPopMatrix();
560
566
                }
 
567
                cairo_dock_set_ortho_view (CAIRO_CONTAINER (pMainDock));
561
568
                if (pMainDock->container.bIsHorizontal)
562
569
                {
563
 
                        cairo_dock_set_ortho_view (pMainDock->container.iWidth, pMainDock->container.iHeight);
564
570
                        glTranslatef (-pMainDock->container.iWidth/2, -pMainDock->container.iHeight/2, 0.);
565
571
                }
566
572
                else
567
573
                {
568
 
                        cairo_dock_set_ortho_view (pMainDock->container.iHeight, pMainDock->container.iWidth);
569
574
                        glTranslatef (-pMainDock->container.iHeight/2, -pMainDock->container.iWidth/2, 0.);
570
575
                }
571
576
                glDisable (GL_DEPTH_TEST);