fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-28 10:40:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support small icons for winOverrideDefaultIcon too.

Browse source
This commit is contained in:
Alexander Gottwald 2004-05-19 21:03:58 +00:00
parent c3dd97f5ca
commit 651822270c
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hw/xwin/ChangeLog
View file

@ -1,3 +1,10 @@
2004-05-19 Alexander Gottwald <ago@freedesktop.org>
* winmultiwindowicons.c (winInitGlobalIcons): Load the small default
icon too
* winprefs.h, winprefs.c (winOverrideDefaultIcon): Takes the iconsize
as parameter
2004-05-19 Alexander Gottwald <ago@freedesktop.org>
* win.h, winmultiwindowicons.c (winXIconToHICON): Takes iconsize

6
hw/xwin/winmultiwindowicons.c
View file

@ -403,11 +403,13 @@ winUpdateIcon (Window id)
void winInitGlobalIcons (void)
{
int sm_cx = GetSystemMetrics(SM_CXICON);
int sm_cxsm = GetSystemMetrics(SM_CXSMICON);
/* Load default X icon in case it's not ready yet */
if (!g_hIconX)
{
g_hIconX = (HICON)winOverrideDefaultIcon();
g_hSmallIconX = NULL;
g_hIconX = (HICON)winOverrideDefaultIcon(sm_cx);
g_hSmallIconX = (HICON)winOverrideDefaultIcon(sm_cxsm);
}
if (!g_hIconX)

4
hw/xwin/winprefs.c
View file

@ -497,13 +497,13 @@ SetupRootMenu (unsigned long hmenuRoot)
* Check for and return an overridden default ICON specified in the prefs
*/
unsigned long
winOverrideDefaultIcon()
winOverrideDefaultIcon(int size)
{
HICON hicon;
if (pref.defaultIconName[0])
{
hicon = LoadImageComma (pref.defaultIconName, 0, 0, LR_DEFAULTSIZE);
hicon = LoadImageComma (pref.defaultIconName, size, size, 0);
if (hicon==NULL)
ErrorF ("winOverrideDefaultIcon: LoadImageComma(%s) failed\n",
pref.defaultIconName);

2
hw/xwin/winprefs.h
View file

@ -157,5 +157,5 @@ unsigned long
winTaskbarIcon(void);
unsigned long
winOverrideDefaultIcon(void);
winOverrideDefaultIcon(int size);
#endif