← Back to branch summary

~glitter-team/glitter/trunk

« back to all changes in this revision

Viewing changes to glitter/style.py

  • Committer: Jan Jokela
  • Date: 2009-03-12 15:21:30 UTC
  • mto: This revision was merged to the branch mainline in revision 16.
  • Revision ID: janjokela@gmail.com-20090312152130-8t0gmepqelp4ehto
(glitter/data/themes/nublo/sofa/*) General improvements for the sofa theme; (glitter/style.py) Behaviour changes in style merging; (glitter/widget.py) Fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
glitter/style.py
59
59
        """
60
60
        
61
61
        new_style = Style(**self._properties)
 
62
        
62
63
        for key, value in style:
63
 
            setattr(new_style, key, value)
 
64
            if key not in new_style.get_properties():
 
65
                setattr(new_style, key, value)
64
66
            
65
67
        return new_style
 
68
            
 
69
            
66
70
        
67
71
    def get_properties(self):
68
72
        """ Retrieve the property dictionary """