>From 4253df0559f8c1e3b19e3e1c9002c20c54f87d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Sat, 2 Jun 2012 21:38:32 +0200
Subject: [PATCH] New function create_logo_image
New function create_logo_image to set the logo image.
---
src/defaults.c | 12 +-----------
src/screen.c | 18 +++++++++++-------
src/screen.h | 2 +-
3 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/defaults.c b/src/defaults.c
index 40c4122..0c4daf1 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -969,22 +969,12 @@ void wDefaultsCheckDomains(void* arg)
for (i = 0; i < wScreenCount; i++) {
scr = wScreenWithNumber(i);
if (scr) {
- RImage *image;
-
wDefaultUpdateIcons(scr);
/* Update the panel image if
changed */
/* Don't worry. If the image is
the same these
* functions will have no
performance impact. */
- image = wDefaultGetImage(scr,
"Logo", "WMPanel", wPreferences.icon_size);
-
- if (!image) {
- wwarning(_("could not
load logo image for panels: %s"),
-
RMessageForError(RErrorCode));
- } else {
-
WMSetApplicationIconImage(scr->wmscreen, image);
- RReleaseImage(image);
- }
+ create_logo_image(scr);
}
}
}
diff --git a/src/screen.c b/src/screen.c
index 4f279f0..27decbd 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -359,7 +359,6 @@ static void allocGCs(WScreen * scr)
static void createPixmaps(WScreen * scr)
{
WPixmap *pix;
- RImage *image;
/* load pixmaps */
pix = wPixmapCreateFromXBMData(scr, (char
*)MENU_RADIO_INDICATOR_XBM_DATA,
@@ -402,7 +401,17 @@ static void createPixmaps(WScreen * scr)
pix->shared = 1;
scr->menu_shade_indicator = pix;
- image = wDefaultGetImage(scr, "Logo", "WMPanel",
wPreferences.icon_size);
+ create_logo_image(scr);
+
+ scr->dock_dots = make3Dots(scr);
+
+ /* titlebar button pixmaps */
+ allocButtonPixmaps(scr);
+}
+
+void create_logo_image(WScreen *scr)
+{
+ RImage *image = wDefaultGetImage(scr, "Logo", "WMPanel",
wPreferences.icon_size);
if (!image) {
wwarning(_("could not load logo image for panels: %s"),
RMessageForError(RErrorCode));
@@ -410,11 +419,6 @@ static void createPixmaps(WScreen * scr)
WMSetApplicationIconImage(scr->wmscreen, image);
RReleaseImage(image);
}
-
- scr->dock_dots = make3Dots(scr);
-
- /* titlebar button pixmaps */
- allocButtonPixmaps(scr);
}
/*
diff --git a/src/screen.h b/src/screen.h
index af5a97b..f021096 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -310,7 +310,7 @@ WScreen *wScreenSearchForRootWindow(Window window);
WScreen *wScreenForWindow(Window window); /* slower than above functions */
void wScreenFinish(WScreen *scr);
-
void wScreenUpdateUsableArea(WScreen *scr);
+void create_logo_image(WScreen *scr);
#endif
--
1.7.10
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 4253df0559f8c1e3b19e3e1c9002c20c54f87d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Sat, 2 Jun 2012 21:38:32 +0200
Subject: [PATCH] New function create_logo_image
New function create_logo_image to set the logo image.
---
src/defaults.c | 12 +-----------
src/screen.c | 18 +++++++++++-------
src/screen.h | 2 +-
3 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/defaults.c b/src/defaults.c
index 40c4122..0c4daf1 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -969,22 +969,12 @@ void wDefaultsCheckDomains(void* arg)
for (i = 0; i < wScreenCount; i++) {
scr = wScreenWithNumber(i);
if (scr) {
- RImage *image;
-
wDefaultUpdateIcons(scr);
/* Update the panel image if changed */
/* Don't worry. If the image is the same these
* functions will have no performance impact. */
- image = wDefaultGetImage(scr, "Logo", "WMPanel", wPreferences.icon_size);
-
- if (!image) {
- wwarning(_("could not load logo image for panels: %s"),
- RMessageForError(RErrorCode));
- } else {
- WMSetApplicationIconImage(scr->wmscreen, image);
- RReleaseImage(image);
- }
+ create_logo_image(scr);
}
}
}
diff --git a/src/screen.c b/src/screen.c
index 4f279f0..27decbd 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -359,7 +359,6 @@ static void allocGCs(WScreen * scr)
static void createPixmaps(WScreen * scr)
{
WPixmap *pix;
- RImage *image;
/* load pixmaps */
pix = wPixmapCreateFromXBMData(scr, (char *)MENU_RADIO_INDICATOR_XBM_DATA,
@@ -402,7 +401,17 @@ static void createPixmaps(WScreen * scr)
pix->shared = 1;
scr->menu_shade_indicator = pix;
- image = wDefaultGetImage(scr, "Logo", "WMPanel", wPreferences.icon_size);
+ create_logo_image(scr);
+
+ scr->dock_dots = make3Dots(scr);
+
+ /* titlebar button pixmaps */
+ allocButtonPixmaps(scr);
+}
+
+void create_logo_image(WScreen *scr)
+{
+ RImage *image = wDefaultGetImage(scr, "Logo", "WMPanel", wPreferences.icon_size);
if (!image) {
wwarning(_("could not load logo image for panels: %s"), RMessageForError(RErrorCode));
@@ -410,11 +419,6 @@ static void createPixmaps(WScreen * scr)
WMSetApplicationIconImage(scr->wmscreen, image);
RReleaseImage(image);
}
-
- scr->dock_dots = make3Dots(scr);
-
- /* titlebar button pixmaps */
- allocButtonPixmaps(scr);
}
/*
diff --git a/src/screen.h b/src/screen.h
index af5a97b..f021096 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -310,7 +310,7 @@ WScreen *wScreenSearchForRootWindow(Window window);
WScreen *wScreenForWindow(Window window); /* slower than above functions */
void wScreenFinish(WScreen *scr);
-
void wScreenUpdateUsableArea(WScreen *scr);
+void create_logo_image(WScreen *scr);
#endif
--
1.7.10
