gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Removed unused WScreen variable in wIsADrawer

Browse Source 
The function wIsADrawer() doesn't use the argument WScreen, so can
be removed.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
This commit is contained in:
Rodolfo García Peñas (kix)
2013-10-08 00:56:38 +02:00
committed by Carlos R. Mafra
parent 4a7daf2322
commit 29ac626494
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dock.c
View File

@@ -1416,7 +1416,7 @@ static void dockIconPaint(WAppIcon *btn)
{ {
if (btn == btn->icon->core->screen_ptr->clip_icon) { if (btn == btn->icon->core->screen_ptr->clip_icon) {
wClipIconPaint(btn); wClipIconPaint(btn);
} else if (wIsADrawer(btn->icon->core->screen_ptr, btn)) { } else if (wIsADrawer(btn)) {
wDrawerIconPaint(btn); wDrawerIconPaint(btn);
} else { } else {
wAppIconPaint(btn); wAppIconPaint(btn);
@@ -3452,7 +3452,7 @@ static void openDockMenu(WDock *dock, WAppIcon *aicon, XEvent *event)
entry = dock->menu->entries[++index]; entry = dock->menu->entries[++index];
entry->clientdata = aicon; entry->clientdata = aicon;
entry->flags.indicator_on = aicon->icon->selected; entry->flags.indicator_on = aicon->icon->selected;
wMenuSetEnabled(dock->menu, index, aicon != scr->clip_icon && !wIsADrawer(scr, aicon)); wMenuSetEnabled(dock->menu, index, aicon != scr->clip_icon && !wIsADrawer(aicon));
/* select/unselect all icons */ /* select/unselect all icons */
entry = dock->menu->entries[++index]; entry = dock->menu->entries[++index];
@@ -3544,7 +3544,7 @@ static void openDockMenu(WDock *dock, WAppIcon *aicon, XEvent *event)
/* kill or remove drawer */ /* kill or remove drawer */
entry = dock->menu->entries[++index]; entry = dock->menu->entries[++index];
entry->clientdata = aicon; entry->clientdata = aicon;
if (wIsADrawer(scr, aicon)) { if (wIsADrawer(aicon)) {
entry->callback = removeDrawerCallback; entry->callback = removeDrawerCallback;
entry->text = _("Remove drawer"); entry->text = _("Remove drawer");
wMenuSetEnabled(dock->menu, index, True); wMenuSetEnabled(dock->menu, index, True);
@@ -3622,7 +3622,7 @@ static void iconDblClick(WObjDescriptor *desc, XEvent *event)
} }
else else
toggleCollapsed(dock); toggleCollapsed(dock);
} else if (wIsADrawer(dock->screen_ptr, btn)) { } else if (wIsADrawer(btn)) {
toggleCollapsed(dock); toggleCollapsed(dock);
} else if (btn->command) { } else if (btn->command) {
if (!btn->launching && (!btn->running || (event->xbutton.state & ControlMask))) if (!btn->launching && (!btn->running || (event->xbutton.state & ControlMask)))
@@ -4531,7 +4531,7 @@ static void swapDrawers(WScreen *scr, int on_right_side, int new_x)
} }
int wIsADrawer(WScreen *scr, WAppIcon *aicon) int wIsADrawer(WAppIcon *aicon)
{ {
return aicon && aicon->dock && return aicon && aicon->dock &&
aicon->dock->type == WM_DRAWER && aicon->dock->icon_array[0] == aicon; aicon->dock->type == WM_DRAWER && aicon->dock->icon_array[0] == aicon;

2
src/dock.h
View File

@@ -104,7 +104,7 @@ WAppIcon *wClipRestoreState(WScreen *scr, WMPropList *clip_state);
void wDrawerIconPaint(WAppIcon *dicon); void wDrawerIconPaint(WAppIcon *dicon);
void wDrawersSaveState(WScreen *scr); void wDrawersSaveState(WScreen *scr);
void wDrawersRestoreState(WScreen *scr); void wDrawersRestoreState(WScreen *scr);
int wIsADrawer(WScreen *scr, WAppIcon *aicon); int wIsADrawer(WAppIcon *aicon);
void wClipUpdateForWorkspaceChange(WScreen *scr, int workspace); void wClipUpdateForWorkspaceChange(WScreen *scr, int workspace);

2
src/dockedapp.c
View File

@@ -179,7 +179,7 @@ static void panelBtnCallback(WMWidget * self, void *data)
// Cf dock.c:dockIconPaint(WAppIcon *aicon)? // Cf dock.c:dockIconPaint(WAppIcon *aicon)?
if (aicon == aicon->icon->core->screen_ptr->clip_icon) if (aicon == aicon->icon->core->screen_ptr->clip_icon)
wClipIconPaint(aicon); wClipIconPaint(aicon);
else if (wIsADrawer(aicon->icon->core->screen_ptr, aicon)) else if (wIsADrawer(aicon))
wDrawerIconPaint(aicon); wDrawerIconPaint(aicon);
else else
wAppIconPaint(aicon); wAppIconPaint(aicon);