← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/implementations/cairo-dock-default-view.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/implementations/cairo-dock-default-view.c
27
27
#include "gldi-config.h"
28
28
#include "cairo-dock-icon-facility.h"
29
29
#include "cairo-dock-backends-manager.h"
30
 
#include "cairo-dock-dock-manager.h"
 
30
#include "cairo-dock-stack-icon-manager.h"
 
31
#include "cairo-dock-separator-manager.h"
31
32
#include "cairo-dock-draw.h"
32
33
#include "cairo-dock-animations.h"  // cairo_dock_calculate_magnitude
33
34
#include "cairo-dock-draw-opengl.h"
35
36
#include "cairo-dock-log.h"
36
37
#include "cairo-dock-dock-facility.h"
37
38
#include "cairo-dock-object.h"
 
39
#include "cairo-dock-dock-manager.h"
38
40
#include "cairo-dock-desktop-manager.h"  // gldi_dock_get_screen_width
39
41
#include "cairo-dock-default-view.h"
40
42
 
293
295
                icon = ic->data;
294
296
 
295
297
                cairo_save (pCairoContext);
296
 
                if (myIconsParam.iSeparatorType != CAIRO_DOCK_NORMAL_SEPARATOR && icon->cFileName == NULL && CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))
 
298
                if (myIconsParam.iSeparatorType != CAIRO_DOCK_NORMAL_SEPARATOR && icon->cFileName == NULL && GLDI_OBJECT_IS_SEPARATOR_ICON (icon))
297
299
                        _cairo_dock_draw_separator (icon, pDock, pCairoContext, fDockMagnitude);
298
300
                else
299
301
                        cairo_dock_render_one_icon (icon, pDock, pCairoContext, fDockMagnitude, TRUE);
628
630
                icon = ic->data;
629
631
                
630
632
                glPushMatrix ();
631
 
                if (myIconsParam.iSeparatorType != CAIRO_DOCK_NORMAL_SEPARATOR && icon->cFileName == NULL && CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))
 
633
                if (myIconsParam.iSeparatorType != CAIRO_DOCK_NORMAL_SEPARATOR && icon->cFileName == NULL && GLDI_OBJECT_IS_SEPARATOR_ICON (icon))
632
634
                        _cairo_dock_draw_separator_opengl (icon, pDock, fDockMagnitude);
633
635
                else
634
636
                        cairo_dock_render_one_icon_opengl (icon, pDock, fDockMagnitude, TRUE);