← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gldit/cairo-dock-flying-container.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-09-07 20:31:25 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100907203125-tkq6wc8rw0flx5se
Tags: 2.2.0~0rc1-0ubuntu1
https://launchpad.net/bugs/632055
https://launchpad.net/bugs/618336
https://launchpad.net/bugs/614686
https://launchpad.net/bugs/612617
https://launchpad.net/bugs/612355
https://launchpad.net/bugs/611733
* New Upstream Version (LP: #632055)
* Fixed a few bugs on LP:
 - LP: #618336 all button tips visible if icons 'maximum zoom' set to 1.0
 - LP: #614686 create new sud-dock icon that looking like flat
 - LP: #612617 Add custom launchers or sub-docks, can't modify name.
 - LP: #612355 Add option in config file to set GL/Cairo mode            
 - LP: #611733 icon labels go off-screen
* Fixed a crash when changing theme or gauges
* Updated translations

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-flying-container.c
31
31
 
32
32
#include "../config.h"
33
33
#include "cairo-dock-draw.h"
 
34
#include "cairo-dock-opengl.h"
34
35
#include "cairo-dock-draw-opengl.h"
35
36
#include "cairo-dock-icons.h"
36
37
#include "cairo-dock-modules.h"
240
241
                else
241
242
                        glFlush ();
242
243
                gdk_gl_drawable_gl_end (pGlDrawable);
243
 
                if (! pFlyingContainer->pIcon)  // plus d'icone, le container va se faire detruire sous peu, on repasse donc sur un contexte qui a plus d'avenir, sinon cela peut invalider les fonctions qui font appel a OpenGL sans definir de contexte (genre cairo_dock_create_texture_from_surface).
244
 
                {
245
 
                        GdkGLContext *pGlContext = gtk_widget_get_gl_context (g_pPrimaryContainer->pWidget);
246
 
                        GdkGLDrawable *pGlDrawable = gtk_widget_get_gl_drawable (g_pPrimaryContainer->pWidget);
247
 
                        if (gdk_gl_drawable_gl_begin (pGlDrawable, pGlContext))
248
 
                                gdk_gl_drawable_gl_end (pGlDrawable);
249
 
                }
250
244
        }
251
 
        else
 
245
        else
252
246
        {
253
247
                cairo_t *pCairoContext = cairo_dock_create_drawing_context_on_container (CAIRO_CONTAINER (pFlyingContainer));
254
248