Changeset 21403

Timestamp:

05/11/07 08:02:08 (3 years ago)

Author:

zbujtas

Message:

2007-05-11 bujtas < zbujtas@gmail.com>

Reviewed by Sriram.
DESC: disabled widgets should not get activated. add dimmed checkbox and radiobutton.
 http://bugs.webkit.org/show_bug.cgi?id=13678

WARNING: NO TEST CASES ADDED OR CHANGED

• bridge/WebCoreBridge.cpp: (CWebCoreBridge::NavigableNodeUnderCursor): (CWebCoreBridge::NodeTypeB):
• kwq/KWQKHTMLPart.cpp: (KWQKHTMLPart::activateNodeAtPoint):

Location:

S60/branches/3.1m

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/WebCoreBridge.cpp (modified) (2 diffs)
• WebCore/kwq/KWQKHTMLPart.cpp (modified) (1 diff)
• WebKit/BrowserCore/Formcontrols/inc/FControlCheckBoxSkin.h (modified) (5 diffs)
• WebKit/BrowserCore/Formcontrols/src/FControlCheckBoxSkin.cpp (modified) (4 diffs)
• WebKit/ChangeLog (modified) (1 diff)

S60/branches/3.1m/WebCore/ChangeLog

@@ +1 @@
+2007-05-11  bujtas  <zbujtas@gmail.com>
+
+        Reviewed by Sriram.
+        DESC: disabled widgets should not get activated. add dimmed checkbox and radiobutton.
+        http://bugs.webkit.org/show_bug.cgi?id=13678
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * bridge/WebCoreBridge.cpp:
+        (CWebCoreBridge::NavigableNodeUnderCursor):
+        (CWebCoreBridge::NodeTypeB):
+        * kwq/KWQKHTMLPart.cpp:
+        (KWQKHTMLPart::activateNodeAtPoint):
+
 2007-05-07  yadavall  <sriram.yadavalli@nokia.com>
 

S60/branches/3.1m/WebCore/bridge/WebCoreBridge.cpp

@@ -2680 +2680 @@
                     {
                     aElType = NodeTypeB( navNode );
+                    // focus node could be disabled
+                    if (aElType == EWebCoreElementNone) {
+                        iPart->xmlDocImpl()->setFocusNode( 0 );
+                        aFocusRect = TRect();
+                        return EFalse;
+                    }
                     aFocusRect = navNode->getRect().Rect();
                     return ETrue;
@@ -2766 +2772 @@
       {
             HTMLInputElementImpl* inputElement = static_cast<HTMLInputElementImpl *>(aFocusNode);
+            // do not focus disabled widgets
+            if (inputElement->disabled())
+                return EWebCoreElementNone;
+
             TInt type = inputElement->inputType();
             switch(inputElement->inputType())

S60/branches/3.1m/WebCore/kwq/KWQKHTMLPart.cpp

@@ -1954 +1954 @@
         if(navNode->renderer() && navNode->renderer()->isWidget()) {
             QWidget* w = static_cast<RenderWidget*>(navNode->renderer())->widget();
-            if (w) {
+            if (w && w->isEnabled()) {
                 w->clicked();
                 xmlDocImpl()->setFocusNode( navNode );

S60/branches/3.1m/WebKit/BrowserCore/Formcontrols/inc/FControlCheckBoxSkin.h

@@ -10 +10 @@
 *    All rights reserved.
 *  
-*       Redistribution and use in source and binary forms, with or without
-*       modification, are permitted provided that the following conditions
-*       are met:
+*   Redistribution and use in source and binary forms, with or without
+*   modification, are permitted provided that the following conditions
+*   are met:
 *  
 *      * Redistributions of source code must retain the above copyright
@@ -24 +24 @@
 *        from this software without specific prior written permission.
 *  
-*       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*       DAMAGE.
+*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+*   DAMAGE.
 *  
 *    Please see file patentlicense.txt for further grants.
@@ -82 +82 @@
   public:
 
-        /**
-        * Constructor
-        */
-        CFormCheckBoxSkin( CCannedImages& aCannedImages, 
+    /**
+    * Constructor
+    */
+    CFormCheckBoxSkin( CCannedImages& aCannedImages, 
                            TCheckBoxType aCheckBoxType);
 
     // CWebCoreFormWidget methods
-        
-        /**
+    
+    /**
     * Returns the size of the check box bitmap
     * @return TSize
@@ -96 +96 @@
     TSize SizeHint() const;
     
-        /**
+    /**
     * Rapaints the Rect with the new/current bitmap
     */
-        void Draw( CWebCoreGraphicsContext& aPainter, 
+    void Draw( CWebCoreGraphicsContext& aPainter, 
                    const TRect& aRect );
-        
-        /**
-        * Saves the Visible State (Not Used)
-        */
-        void MakeVisible(TBool aVisible) ;
-    
-        /**
-        * SetFocus modifies the button apperence by changing the bitmap
-        */
-        void SetFocus(TBool aFocus) ;
-    
-        /**
-        * Activate - called when the button is clicked
-        */
-        void Activate();
-        
-        /**
-        * Sets the Rect
-        */
-        void SetRect(const TRect& aRect) ;
+    
+    /**
+    * Saves the Visible State (Not Used)
+    */
+    void MakeVisible(TBool aVisible) ;
+    
+    /**
+    * SetFocus modifies the button apperence by changing the bitmap
+    */
+    void SetFocus(TBool aFocus) ;
+    
+    /**
+    * Activate - called when the button is clicked
+    */
+    void Activate();
+    
+    /**
+    * Sets the Rect
+    */
+    void SetRect(const TRect& aRect) ;
 
     /**
@@ -149 +149 @@
     // MWebCoreCheckBoxControl related methods
 
-        /**
-        * Sets the Checked state
-        */
+    /**
+    * Sets the Checked state
+    */
     void SetChecked(TBool aIsChecked);
 
     TBool IsChecked() {return iIsChecked;}
 
-        /**
-        * Saves pointer to the event handler
-        */
+    /**
+    * Saves pointer to the event handler
+    */
     void SetEventHandler(MWebCoreFormEventHandler* aActivateEventHandler) ;
     
-        /**
-        * Saves pointer to the browser control parent
-        */
+    /**
+    * Saves pointer to the browser control parent
+    */
     void SetParent( MWebCoreScrollView* aParent );
 
-        void Close(){ delete this;}
+    void Close(){ delete this;}
 
     ~CFormCheckBoxSkin();
+    
+    /**
+    * Creates a dimmed mask for the current bitmap
+    */
+    void CreateDimmedMaskL();
 
   private:
 
-        // private methods
-    
-        /**
-        *  Default constructor
-        */
-        CFormCheckBoxSkin();
-
-        TCannedImageData& GetImage() const;
-        void InvalidateRect();
+    // private methods
+    
+    /**
+    *  Default constructor
+    */
+    CFormCheckBoxSkin();
+
+    TCannedImageData& GetImage() const;
+    void InvalidateRect();
 
     // private member data 
 
-        // Check Box Type
-        TCheckBoxType iCheckBoxType;
-        // Checked state
+    // Check Box Type
+    TCheckBoxType iCheckBoxType;
+    // Checked state
     TBool iIsChecked;
-        // widget Rect
+    // widget Rect
     TRect iRect;
-        // Focused state
-        TBool iFocused;
-        // Visible state (Not Used)
+    // Focused state
+    TBool iFocused;
+    // Visible state (Not Used)
     TBool iVisible;
-        // pointer to event handler
+    // pointer to event handler
     MWebCoreFormEventHandler* iCheckBoxEventHandler;
-        // pointer to parent view
+    // pointer to parent view
     MWebCoreScrollView* iParent;
 
-        // Image bitmaps
+    // Image bitmaps
     CCannedImages& iCannedImages;
-  };
+    CFbsBitmap* iDimmedBitmapMask;  // owned
+};
 #endif //WEBCORE_CHECKBOX_WIDGET_CONTROL_H_

S60/branches/3.1m/WebKit/BrowserCore/Formcontrols/src/FControlCheckBoxSkin.cpp

@@ -87 +87 @@
 void CFormCheckBoxSkin::SetChecked(TBool aIsChecked)
     {
+    // delete dimmed mask when the status changes. recreate it when it is needed
+    if (iDimmedBitmapMask && iIsChecked != aIsChecked )
+        {
+        delete iDimmedBitmapMask;
+        iDimmedBitmapMask = NULL;
+        }
     iIsChecked = aIsChecked;
-  InvalidateRect();
+    InvalidateRect();
     }
 
@@ -120 +126 @@
     TRect r(image.iImage->SizeInPixels());
     gcContext->SetBrushStyle(CGraphicsContext::ENullBrush);
-    gcContext->BitBltMasked(imagePoint, image.iImage, r, image.iMask, ETrue);
+    TInt err(KErrNone);
+    if (!iVisible && !iDimmedBitmapMask) 
+        {
+        TRAP(err, CreateDimmedMaskL());
+        }
+    gcContext->BitBltMasked(imagePoint, image.iImage, r, (!iVisible && err == KErrNone) ? iDimmedBitmapMask : image.iMask, ETrue);
     }
 
@@ -161 +172 @@
 void CFormCheckBoxSkin::MakeVisible(TBool aVisible)
     {
+    // delete dimmed mask when the status changes. recreate it when it is needed
+    if (iDimmedBitmapMask && iVisible != aVisible)
+        {
+        delete iDimmedBitmapMask;
+        iDimmedBitmapMask = NULL;
+        }
     iVisible = aVisible;
     }
@@ -251 +268 @@
 //-----------------------------------------------------------------------------
 CFormCheckBoxSkin::~CFormCheckBoxSkin()
-    {}
-
+    {
+    delete iDimmedBitmapMask;
+    }
+
+void CFormCheckBoxSkin::CreateDimmedMaskL() 
+    {
+    TCannedImageData image = GetImage();
+    TSize s = image.iMask->SizeInPixels();
+    iDimmedBitmapMask = new (ELeave) CFbsBitmap();
+    iDimmedBitmapMask->Create(s,image.iMask->DisplayMode());
+    CFbsBitmapDevice* dev = CFbsBitmapDevice::NewL(iDimmedBitmapMask);
+    CleanupStack::PushL(dev);
+    CFbsBitGc* gc;
+    User::LeaveIfError(dev->CreateContext(gc));
+    gc->BitBlt(TPoint(0,0),image.iMask);
+    iDimmedBitmapMask->LockHeap();
+    TUint8* data = (TUint8*)iDimmedBitmapMask->DataAddress();
+    TUint8* end = data + s.iWidth*s.iHeight;
+    // divide all pixels by 3
+    while ( data<end )
+        {
+        *(data++) /= 3;
+        }
+    iDimmedBitmapMask->UnlockHeap();
+    delete gc;
+    CleanupStack::PopAndDestroy();
+    }

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+2007-05-11  bujtas  <zbujtas@gmail.com>
+
+        Reviewed by Sriram
+        DESC: disabled widgets should not get activated. add dimmed checkbox and radiobutton.
+        http://bugs.webkit.org/show_bug.cgi?id=13678
+
+        * BrowserCore/Formcontrols/inc/FControlCheckBoxSkin.h:
+        * BrowserCore/Formcontrols/src/FControlCheckBoxSkin.cpp:
+        (CFormCheckBoxSkin::SetChecked):
+        (CFormCheckBoxSkin::Draw):
+        (CFormCheckBoxSkin::MakeVisible):
+        (CFormCheckBoxSkin::~CFormCheckBoxSkin):
+        (CFormCheckBoxSkin::CreateFadeBitmapL):
+
 2007-05-09  vbradley  <vincent.bradley@nokia.com>