← 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-dock-facility.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-dock-facility.c
22
22
#include <gdk/gdkx.h>  // GDK_WINDOW_XID
23
23
 
24
24
#include "cairo-dock-applications-manager.h"  // cairo_dock_set_icons_geometry_for_window_manager
 
25
#include "cairo-dock-launcher-manager.h"
 
26
#include "cairo-dock-separator-manager.h"  // GLDI_OBJECT_IS_SEPARATOR_ICON
 
27
#include "cairo-dock-stack-icon-manager.h"  // GLDI_OBJECT_IS_DRAWER_ICON
 
28
#include "cairo-dock-class-icon-manager.h"
25
29
#include "cairo-dock-icon-facility.h"
26
30
#include "cairo-dock-backends-manager.h"  // myBackendsParam.fSubDockSizeRatio
27
31
#include "cairo-dock-X-utilities.h" // cairo_dock_set_strut_partial
67
71
                        icon->fWidth /= pDock->container.fRatio;
68
72
                        icon->fHeight /= pDock->container.fRatio;
69
73
                        pDock->fFlatDockWidth += icon->fWidth + myIconsParam.iIconGap;
70
 
                        if (! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))
 
74
                        if (! GLDI_OBJECT_IS_SEPARATOR_ICON (icon))
71
75
                                pDock->iMaxIconHeight = MAX (pDock->iMaxIconHeight, icon->fHeight);
72
76
                }
73
77
                if (pDock->iMaxIconHeight == 0)
1080
1084
        
1081
1085
        // get user docks only
1082
1086
        Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (pDock, NULL);
1083
 
        if (pPointingIcon && ! CAIRO_DOCK_ICON_TYPE_IS_CONTAINER (pPointingIcon))  // avoid sub-docks that are not from the theme (applet sub-docks, class sub-docks, etc).
 
1087
        if (pPointingIcon && ! GLDI_OBJECT_IS_STACK_ICON (pPointingIcon))  // avoid sub-docks that are not from the theme (applet sub-docks, class sub-docks, etc).
1084
1088
                return;
1085
1089
        
1086
1090
        // ignore the parent dock.
1115
1119
                {
1116
1120
                        cairo_dock_reload_icon_image (pIcon, CAIRO_CONTAINER (pDock));
1117
1121
                }
1118
 
                cairo_dock_redraw_icon (pIcon, CAIRO_CONTAINER (pDock));
 
1122
                cairo_dock_redraw_icon (pIcon);
1119
1123
                if (pDock->iRefCount != 0 && ! pIcon->bDamaged)  // now that the icon image is correct, redraw the pointing icon if needed
1120
1124
                        cairo_dock_trigger_redraw_subdock_content (pDock);
1121
1125
        }
1126
1130
{
1127
1131
        Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (pDock, NULL);
1128
1132
        //g_print ("%s (%s, %d)\n", __func__, pPointingIcon?pPointingIcon->cName:NULL, pPointingIcon?pPointingIcon->iSubdockViewType:0);
1129
 
        if (pPointingIcon != NULL && (pPointingIcon->iSubdockViewType != 0 || (pPointingIcon->cClass != NULL && ! myIndicatorsParam.bUseClassIndic && (CAIRO_DOCK_ICON_TYPE_IS_CLASS_CONTAINER (pPointingIcon) || CAIRO_DOCK_ICON_TYPE_IS_LAUNCHER (pPointingIcon)))))
 
1133
        if (pPointingIcon != NULL && (pPointingIcon->iSubdockViewType != 0 || (pPointingIcon->cClass != NULL && ! myIndicatorsParam.bUseClassIndic && (CAIRO_DOCK_ICON_TYPE_IS_CLASS_CONTAINER (pPointingIcon) || GLDI_OBJECT_IS_LAUNCHER_ICON (pPointingIcon)))))
1130
1134
        {
1131
1135
                if (pPointingIcon->iSidRedrawSubdockContent != 0)  // s'il y'a deja un redessin de prevu, on le passe a la fin de facon a ce qu'il ne se fasse  pas avant le redessin de l'icone responsable de ce trigger.
1132
1136
                        g_source_remove (pPointingIcon->iSidRedrawSubdockContent);
1148
1152
        if (pPointingIcon != NULL && pPointingIcon->iSubdockViewType != 0 && pPointingIcon->iSidRedrawSubdockContent == 0 && pParentDock != NULL)
1149
1153
        {
1150
1154
                cairo_dock_draw_subdock_content_on_icon (pPointingIcon, pParentDock);
1151
 
                cairo_dock_redraw_icon (pPointingIcon, CAIRO_CONTAINER (pParentDock));
 
1155
                cairo_dock_redraw_icon (pPointingIcon);
1152
1156
        }
1153
1157
}
1154
1158