← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-10-06 19:23:03 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20101006192303-o9k0z64l9mx5irip
Tags: 2.2.0~4-0ubuntu1
https://launchpad.net/bugs/653702
https://launchpad.net/bugs/611738
https://launchpad.net/bugs/518628
* New Upstream Version (LP: #653702)
* Fixed a few bugs:
 - Fixed a random crash if CD is launched much time before the WM
 - Improved the OpenGL backend.
 - Some Images paths were wrong
 - Icon label text was truncated (LP: #611738)
 - Fixed a bug when the font was too big
 - Gauges: Add a line return in order to read all Readme file
 - Dialogues don't respect selected font (LP: #518628)
* data/help.conf.in:
 - Removed the Gnome-Panel: Used the right gconf key

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-container.c
41
41
#include "cairo-dock-notifications.h"
42
42
#include "cairo-dock-animations.h"
43
43
#include "cairo-dock-callbacks.h"
 
44
#include "cairo-dock-X-manager.h"
44
45
#include "cairo-dock-container.h"
45
46
 
46
47
static gboolean s_bSticky = TRUE;
49
50
CairoContainer *g_pPrimaryContainer = NULL;
50
51
extern gboolean g_bUseOpenGL;
51
52
extern CairoDockHidingEffect *g_pHidingBackend;  // cairo_dock_is_hidden
 
53
extern CairoDockDesktopGeometry g_desktopGeometry;
52
54
 
53
55
 
54
56
static gboolean _cairo_dock_on_delete (GtkWidget *pWidget, GdkEvent *event, gpointer data)
109
111
        }
110
112
        if (g_pPrimaryContainer == pContainer)
111
113
                g_pPrimaryContainer = NULL;
112
 
        else if (g_pPrimaryContainer != NULL)
 
114
        else if (g_bUseOpenGL && g_pPrimaryContainer != NULL)
113
115
                cairo_dock_set_default_gl_context ();
114
116
}
115
117
 
434
436
        {
435
437
                *x = x0;
436
438
                if (pContainer->bDirectionUp)
437
 
                        *y = y0 - h;  /// - h_menu ?...
 
439
                        *y = y0 - h;
438
440
                else
439
441
                        *y = y0 + pIcon->fHeight * pIcon->fScale;
440
442
        }
441
443
        else
442
444
        {
443
 
                *y = x0;
 
445
                *y = MIN (x0, g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL] - h);
444
446
                if (pContainer->bDirectionUp)
445
 
                        *x = y0 - w;  /// - w_menu ?...
 
447
                        *x = y0 - w;
446
448
                else
447
449
                        *x = y0 + pIcon->fHeight * pIcon->fScale;
448
450
        }