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

Remove code duplication by calling paint_app_icon()

Browse Source 
The code in application.c to create+paint the application icon is
included in appicon.c (function paint_app_icon).
This commit is contained in:
Rodolfo García Peñas (kix)
2012-06-01 12:54:55 +02:00
committed by Carlos R. Mafra
parent 2e7b039558
commit bd3fb21441
1 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/application.c
View File

@@ -322,34 +322,8 @@ WApplication *wApplicationCreate(WWindow * wwin)
if (!WFLAGP(wapp->main_window_desc, no_appicon)) if (!WFLAGP(wapp->main_window_desc, no_appicon))
app_icon_create_from_docks(wwin, wapp, main_window); app_icon_create_from_docks(wwin, wapp, main_window);
if (wapp->app_icon) /* Now, paint the icon */
wapp->app_icon->main_window = main_window; paint_app_icon(wapp);
if (wapp->app_icon && !wapp->app_icon->docked) {
WIcon *icon = wapp->app_icon->icon;
WDock *clip = scr->workspaces[scr->current_workspace]->clip;
int x = 0, y = 0;
if (clip && clip->attract_icons && wDockFindFreeSlot(clip, &x, &y)) {
wapp->app_icon->attracted = 1;
if (!icon->shadowed) {
icon->shadowed = 1;
icon->force_paint = 1;
/* wAppIconPaint() is done in wDockAttachIcon() below */
}
wDockAttachIcon(clip, wapp->app_icon, x, y);
} else {
PlaceIcon(scr, &x, &y, wGetHeadForWindow(wapp->main_window_desc));
wAppIconMove(wapp->app_icon, x, y);
wLowerFrame(icon->core);
}
if (!clip || !wapp->app_icon->attracted || !clip->collapsed)
XMapWindow(dpy, icon->core->window);
}
if (wPreferences.auto_arrange_icons && wapp->app_icon && !wapp->app_icon->attracted)
wArrangeIcons(scr, True);
/* Save the app_icon in a file */ /* Save the app_icon in a file */
save_app_icon(wwin, wapp); save_app_icon(wwin, wapp);