Merge lp:~osomon/elisa/css_property_no_unit into lp:elisa

[Olivier Tilloy]

This branch addresses bug #379409.
Recent versions of the parser in CSSUtils (≥ 0.9.6, e.g. as found in Ubuntu 10.04) will trim the unit for zero values: "top_height: 0px;" will become "top_height: 0;".
The issue is with the PiecePanel widget that always expects ValueWithUnits for its attributes.
The proposed solution restores the unit for values that don't have it in update_style_properties().

The careful reviewer will verify that the very verbose tracebacks are gone, that the UI is rendered as designed, and that this change doesn't break existing unit tests.

[Jonathan Rauprich (joni-noplu)]

This patch fixes the problem on my machine (Ubuntu 10.04 x64), no problems noticed.

review: Approve

[Florian Boucault (fboucault)]

I dislike it because it is a local workaround. I would rather have a global fix. However the code is good to go.

It greatly improves the performance too.

Thanks!

review: Approve

[Olivier Tilloy (osomon)]

Thanks for the review! That's not my favourite solution either, but it does the job efficiently. The ideal solution would be to find a way to tell CCSUtils not to trim the units when the value is 0, but I don't think this is possible... I'm going to merge this one, and I'll be happy to review/merge a more global solution anyone may come up with.

=== modified file 'elisa-plugins/elisa/plugins/pigment/widgets/panel.py'
--- elisa-plugins/elisa/plugins/pigment/widgets/panel.py	2009-11-17 22:55:46 +0000
+++ elisa-plugins/elisa/plugins/pigment/widgets/panel.py	2010-05-29 18:24:33 +0000
@@ -76,9 +76,21 @@
         self._layout()
 
     def update_style_properties(self, props=None):
+        if props is None:
+            return
+        # Special properties: if they are updated, a re-layout is needed
+        specials = ('top_height', 'bottom_height', 'left_width', 'right_width')
+        needs_layout = False
+        for key in specials:
+            if key in props:
+                needs_layout = True
+                value = props[key]
+                # The CSS parser may have trimed the unit if the value is '0'
+                # (see https://bugs.launchpad.net/elisa/+bug/379409).
+                if not isinstance(value, ValueWithUnit):
+                    props[key] = ValueWithUnit(value, 'px')
         super(PiecePanel, self).update_style_properties(props)
-        if "top_height" in props or "bottom_height" in props or \
-           "left_width" in props or "right_width" in props:
+        if needs_layout:
             self._update_size()
             self._layout()