This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 8c6525a2b7870e1bc0bcbddf11c11e09054f389e (commit)
from 1a01ac103f6d0f890d0a3846a1b06eb09bf0a4db (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/8c6525a2b7870e1bc0bcbddf11c11e09054f389e
commit 8c6525a2b7870e1bc0bcbddf11c11e09054f389e
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Mon May 19 19:51:28 2014 +0200
WPrefs: changed renderTexture to always fallback to solid black when image
can't be loaded
As raised by Carlos R. Mafra and Doug Torrance, when an image is used in a
texture but the image cannot be loaded, there are some case where WPrefs
misbehaves.
This patch display a warning in every case where the image could not be
loaded, and always switch to black texture as a fallback, which was not the
case previously.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 9b42034f..dc1d8c02 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -512,12 +512,16 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList *
texture, int width, int
path = wfindfileinarray(GetObjectForKey("PixmapPath"), str);
if (path) {
timage = RLoadImage(rc, path, 0);
- if (!timage) {
- wwarning("could not load file '%s': %s", path ?
path : str, RMessageForError(RErrorCode));
- texture =
WMCreatePropListFromDescription("(solid, black)");
- type = "solid";
- }
+ if (!timage)
+ wwarning("could not load file '%s': %s", path,
RMessageForError(RErrorCode));
wfree(path);
+ } else {
+ wwarning("could not find file '%s' for %s of texture",
str, type);
+ timage = NULL;
+ }
+ if (!timage) {
+ texture = WMCreatePropListFromDescription("(solid,
black)");
+ type = "solid";
}
}
-----------------------------------------------------------------------
Summary of changes:
WPrefs.app/Appearance.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
