From 5610b97e30804e35cc242e14702e4f4cb8f5aa40 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Fri, 20 May 2005 20:50:42 +0000 Subject: [PATCH] - merge cluts for borders, too --- mytest.py | 2 +- skin.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mytest.py b/mytest.py index 461fdfa2..d6cfb1a2 100644 --- a/mytest.py +++ b/mytest.py @@ -153,7 +153,7 @@ def runScreenTest(): import keymapparser keymapparser.readKeymap() import skin -skin.loadSkin() +skin.loadSkin(getDesktop()) # first, setup a screen runScreenTest() diff --git a/skin.py b/skin.py index 3f5cd26e..bc4931fb 100644 --- a/skin.py +++ b/skin.py @@ -162,7 +162,6 @@ def applyAttributes(guiObject, node, desktop): raise "loading PNG failed!" x = ptr ptr = ptr.__deref__() - print desktop desktop.makeCompatiblePixmap(ptr) guiObject.setPixmap(ptr) # guiObject.setPixmapFromFile(value) @@ -200,7 +199,7 @@ def applyAttributes(guiObject, node, desktop): except AttributeError: print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib) -def loadSkin(): +def loadSkin(desktop): print "loading skin..." def getPNG(x): @@ -231,7 +230,11 @@ def loadSkin(): bpName = str(pixmap.getAttribute("pos")) filename = str(pixmap.getAttribute("filename")) - style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], getPNG(filename)) + png = getPNG(filename) + + # adapt palette + desktop.makeCompatiblePixmap(png) + style.setPixmap(eWindowStyleSkinned.__dict__[bsName], eWindowStyleSkinned.__dict__[bpName], png) for color in elementsWithTag(windowstyle.childNodes, "color"): type = str(color.getAttribute("name")) -- 2.30.2