Attachment 182738 Details for Bug 329832 – proposed patch for the Maintenance branch (similar for trunk)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed patch for the Maintenance branch (similar for trunk)

329832_1.3.patch (text/plain), 2.25 KB, created by Istvan Ballok

on 2010-11-09 12:50:16 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Istvan Ballok

Created: 2010-11-09 12:50:16 EST

Size: 2.25 KB

patch

obsolete

>commit a569d1ef78ffe6131d1bde7402b62fab0c52696d
>tree 2e73eca76164fea638fa2e75c4761d4e7f24a972
>parent ba3e8be82f869584334147553d27ddb5420889e1
>author Istvan Ballok <Istvan.Ballok@cas.de> 1289324826 +0100
>committer Istvan Ballok <Istvan.Ballok@cas.de> 1289324826 +0100
>
>    bug 329832 proposed patch: [Theming] CSS gradient overrides background image set in java
>    
>    change the priority of gradient/image/solid in GraphicsMixin#_handleGfxBackground
>    
>    before:
>    1) gradient 2) image 3) solid
>    after:
>    1) image 2) gradient 3) solid
>    
>    motivation: if we have a "confict": both image and gradient is set,
>    then always the image should win, because the conflict can happen
>    only when the gradient is set in CSS (it is not possible to set it
>    in java) and the image in the API (it is not possible to set it in CSS
>    if a gradient is already set).
>    And if the same property is set in Java and CSS, java should win.
>    -> image has a higher priority than the gradient
>
>diff --git a/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/rwt/GraphicsMixin.js b/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/rwt/GraphicsMixin.js
>index f42fc6b..afee6e6 100644
>--- a/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/rwt/GraphicsMixin.js
>+++ b/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/rwt/GraphicsMixin.js
>@@ -168,12 +168,16 @@ qx.Mixin.define( "org.eclipse.rwt.GraphicsMixin", {
>     },
> 
>     _handleGfxBackground : function() {
>-      var useGradient = this.getGfxProperty( "gradient" ) != null;
>-      if( useGradient ) {
>-        this.setGfxProperty( "fillType", "gradient" );
>+      var useImage = this.getBackgroundImage() != null; 
>+      if (useImage){
>+        this.setGfxProperty( "fillType", "image" );
>       } else {
>-        var useImage = this.getBackgroundImage() != null; 
>-        this.setGfxProperty( "fillType", useImage? "image" : "solid" );        
>+        var useGradient = this.getGfxProperty( "gradient" ) != null;
>+        if( useGradient ) {
>+          this.setGfxProperty( "fillType", "gradient" );
>+        } else {
>+          this.setGfxProperty( "fillType", "solid" );
>+        }
>       }
>       var useBackground = ( useGradient || this._gfxBorderEnabled );
>       var toggle = ( this._gfxBackgroundEnabled != useBackground );

Flags:

tbuschto: iplog+

Actions: View | Diff

Attachments on bug 329832: 182738