diff options
| author | michael.bruning <michael.bruning@digia.com> | 2013-01-07 15:51:38 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-16 18:00:17 +0100 |
| commit | b43a47702cc5073a88b9a71faf9979825a23c806 (patch) | |
| tree | de44a6546fcf7387370176f2651af10147b16222 | |
| parent | 3fdf1c130e7e108f26bb64ec5749c0283103f134 (diff) | |
[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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138946 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I95c3e73766ae9351ae24be0270054d318c1775f0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/WebKit/qt/ChangeLog | 14 | ||||
| -rw-r--r-- | Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog index 2d6981e5b..77eea541b 100644 --- a/Source/WebKit/qt/ChangeLog +++ b/Source/WebKit/qt/ChangeLog @@ -1,5 +1,19 @@ 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> + [Qt] Horizontal scrollbars events are offseted making them difficult to use https://bugs.webkit.org/show_bug.cgi?id=105014 diff --git a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp index 6628d8339..bc8840755 100644 --- a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp +++ b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp @@ -77,7 +77,7 @@ static void initGenericStyleOption(QStyleOption* option, QWidget* widget, const 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; } |