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

applySettings icon set updated

Browse Source 
The function applySettings() set now the icons. Updated icons are:

- Appicon: Always, with or without always_user_icon
- Window: If the window is minimized, with or without always_user_icon.
  Window must be minimized to see the icon change, else, wwin->icon
  doesn't exist and therefore you won't see this change (no icon).

There is a problem if the window is not minimized and is minimezed,
because it will show the icon in the database, not the assigned icon.
This problem must be updated not here, in the wIconifyWindow()
function, at actions.c
This commit is contained in:
Rodolfo García Peñas (kix)
2012-11-15 00:59:34 +01:00
committed by Carlos R. Mafra
parent 3f2c87fb06
commit 2165faec5d
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/winspector.c
View File

@@ -778,20 +778,32 @@ static void applySettings(WMButton *button, InspectorPanel *panel)
else else
paint_app_icon(wapp); paint_app_icon(wapp);
if (wapp->app_icon && wapp->main_window == wwin->client_win) { char *file = WMGetTextFieldText(panel->fileText);
char *file = WMGetTextFieldText(panel->fileText); if (file[0] == 0) {
wfree(file);
if (file[0] == 0) { file = NULL;
wfree(file);
file = NULL;
}
wIconChangeImageFile(wapp->app_icon->icon, file);
if (file)
wfree(file);
wAppIconPaint(wapp->app_icon);
} }
if (WFLAGP(wwin, always_user_icon)) {
/* Change icon image if the app is minimized */
if (wwin->icon)
wIconChangeImageFile(wwin->icon, file);
/* Change App Icon image */
if (wapp->app_icon)
wIconChangeImageFile(wapp->app_icon->icon, file);
} else {
/* Change App Icon image */
if (wapp->app_icon)
wIconUpdate(wapp->app_icon->icon, get_rimage_icon_from_wm_hints(wapp->app_icon->icon));
/* Change icon image if the app is minimized */
if (wwin->icon)
wIconUpdate(wwin->icon, get_rimage_icon_from_wm_hints(wwin->icon));
}
if (file)
wfree(file);
} }
wNETFrameExtents(wwin); wNETFrameExtents(wwin);