← Back to branch summary

~cairo-dock-team/cairo-dock-plug-ins/plug-ins

« back to all changes in this revision

Viewing changes to compiz-icon/src/applet-notifications.c

  • Committer: Fabrice Rey
  • Date: 2010-09-04 00:50:31 UTC
  • Revision ID: fabounet03@gmail.com-20100904005031-cospbn3n8r4g0152
updated menus so that they are correctly layed out when the dock is locked 

Show diffs side-by-side

added added

removed removed

Lines of Context:
compiz-icon/src/applet-notifications.c
144
144
        if (myDock != NULL && myIcon->pSubDock != NULL && pClickedContainer == CAIRO_CONTAINER (myIcon->pSubDock) && pClickedIcon != NULL) {  // clic sur ne icone du sous-dock.
145
145
                //cd_debug (" clic sur %s", pClickedIcon->cName);
146
146
                ///if (pClickedIcon->cCommand != NULL && strcmp (pClickedIcon->cCommand, "none") != 0)
147
 
                ///     return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 
147
                ///     CD_APPLET_LEAVE (CAIRO_DOCK_LET_PASS_NOTIFICATION);
148
148
                _compiz_action_by_id ((int) pClickedIcon->fOrder/2, pClickedIcon);
149
149
        }
150
150
        else if (myDesklet != NULL && pClickedContainer == myContainer && pClickedIcon != NULL) {  // clic sur une des icones du desklet.
152
152
                        cairo_dock_launch_task (myData.pTask);
153
153
                else {
154
154
                        if (pClickedIcon->cCommand != NULL && strcmp (pClickedIcon->cCommand, "none") != 0)
155
 
                                return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 
155
                                CD_APPLET_LEAVE (CAIRO_DOCK_LET_PASS_NOTIFICATION);
156
156
                        _compiz_action_by_id ((int) pClickedIcon->fOrder/2, pClickedIcon);
157
157
                }
158
158
        }
159
159
        else
160
 
                return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 
160
                CD_APPLET_LEAVE (CAIRO_DOCK_LET_PASS_NOTIFICATION);
161
161
CD_APPLET_ON_CLICK_END
162
162
 
163
163
 
166
166
                _action_on_click (myConfig.iActionOnMiddleClick);
167
167
        }
168
168
        else if (pClickedIcon != NULL && pClickedIcon->cCommand != NULL && strcmp (pClickedIcon->cCommand, "none") != 0)
169
 
                return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 
169
                CD_APPLET_LEAVE (CAIRO_DOCK_LET_PASS_NOTIFICATION);
170
170
CD_APPLET_ON_MIDDLE_CLICK_END
171
171
 
172
172
 
195
195
                CD_APPLET_ADD_IN_MENU (D_("Toggle Widget Layer"), _compiz_menu_toggle_wlayer, pSubMenu);
196
196
        }
197
197
        
 
198
        CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Toggle Show Desktop"), GTK_STOCK_FULLSCREEN, _compiz_menu_show_desktop, CD_APPLET_MY_MENU);
 
199
 
 
200
        if (pClickedIcon != myIcon && (pClickedIcon == NULL || pClickedIcon->cCommand == NULL || strcmp (pClickedIcon->cCommand, "none") == 0 || ! CAIRO_DOCK_IS_APPLI (pClickedIcon)))
 
201
                CD_APPLET_LEAVE (CAIRO_DOCK_INTERCEPT_NOTIFICATION);  // on ne veut pas des autres entrees habituelles du menu.
198
202
        CD_APPLET_ADD_SEPARATOR_IN_MENU (pSubMenu);
199
203
        CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
200
 
 
201
 
        CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Toggle Show Desktop"), GTK_STOCK_FULLSCREEN, _compiz_menu_show_desktop, CD_APPLET_MY_MENU);
202
 
 
203
 
        if (pClickedIcon != myIcon && (pClickedIcon == NULL || pClickedIcon->cCommand == NULL || strcmp (pClickedIcon->cCommand, "none") == 0 || ! CAIRO_DOCK_IS_APPLI (pClickedIcon)))
204
 
                return CAIRO_DOCK_INTERCEPT_NOTIFICATION;  // on ne veut pas des autres entrees habituelles du menu.
205
204
CD_APPLET_ON_BUILD_MENU_END