Changeset 138946 in webkit

Timestamp:

Jan 7, 2013 7:51:38 AM (11 years ago)

Author:

michael.bruning@digia.com

Message:

[Qt] Apply correct patch for the scrolling issue from bug 105014
​https://bugs.webkit.org/show_bug.cgi?id=106219

Correct the if condition when overwriting the layout direction option
with the values from the facade options to only overwrite if the facade
direction is not equal to LayoutDirectionAuto.

Reviewed by Allan Sandfeld Jensen.

• WidgetSupport/QStyleFacadeImp.cpp:

(WebKit::initGenericStyleOption):

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WidgetSupport/QStyleFacadeImp.cpp (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2013-01-07  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt] Apply correct patch for the scrolling issue from bug 105014
+        https://bugs.webkit.org/show_bug.cgi?id=106219
+
+        Correct the if condition when overwriting the layout direction option
+        with the values from the facade options to only overwrite if the facade
+        direction is not equal to LayoutDirectionAuto.
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        * WidgetSupport/QStyleFacadeImp.cpp:
+        (WebKit::initGenericStyleOption):
+
 2013-01-07  Michael Brüning  <michael.bruning@digia.com>
 

trunk/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp

@@ -78 +78 @@
     option->rect = facadeOption.rect;
     option->state = convertToQStyleState(facadeOption.state);
-    if (option->direction == Qt::LayoutDirectionAuto)
+    if (facadeOption.direction != Qt::LayoutDirectionAuto)
         option->direction = facadeOption.direction;
     option->palette = facadeOption.palette;