Changeset 93644 in webkit


Ignore:
Timestamp:
Aug 23, 2011 3:57:49 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

Source/WebCore: Prepare to paint slider thumb separately.
Provide proper size values for vertical SliderThumb.
https://bugs.webkit.org/show_bug.cgi?id=66732

Patch by Tatiana Meshkova <tatiana.meshkova@nokia.com> on 2011-08-23
Reviewed by Kenneth Rohde Christiansen.

  • platform/qt/RenderThemeQt.cpp:

(WebCore::RenderThemeQt::adjustSliderThumbSize):
Swap length and thickness for sliderthumb-vertical.

LayoutTests: Swap width and height for sliderthumb-vertical.
https://bugs.webkit.org/show_bug.cgi?id=66732

Patch by Tatiana Meshkova <tatiana.meshkova@nokia.com> on 2011-08-23
Reviewed by Kenneth Rohde Christiansen.

  • platform/qt/fast/forms/range/thumbslider-no-parent-slider-expected.txt:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r93643 r93644  
     12011-08-23  Tatiana Meshkova  <tatiana.meshkova@nokia.com>
     2
     3        Swap width and height for sliderthumb-vertical.
     4        https://bugs.webkit.org/show_bug.cgi?id=66732
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        * platform/qt/fast/forms/range/thumbslider-no-parent-slider-expected.txt:
     9
    1102011-08-23  Peter Kasting  <pkasting@google.com>
    211
  • trunk/LayoutTests/platform/qt/fast/forms/range/thumbslider-no-parent-slider-expected.txt

    r93593 r93644  
    66      RenderBlock {SPAN} at (0,0) size 11x16
    77      RenderBR {BR} at (11,16) size 0x0
    8       RenderBlock {SPAN} at (0,16) size 11x16
     8      RenderBlock {SPAN} at (0,16) size 16x11
    99      RenderText {#text} at (0,0) size 0x0
  • trunk/Source/WebCore/ChangeLog

    r93640 r93644  
     12011-08-23  Tatiana Meshkova  <tatiana.meshkova@nokia.com>
     2
     3        Prepare to paint slider thumb separately.
     4        Provide proper size values for vertical SliderThumb.
     5        https://bugs.webkit.org/show_bug.cgi?id=66732
     6
     7        Reviewed by Kenneth Rohde Christiansen.
     8
     9        * platform/qt/RenderThemeQt.cpp:
     10        (WebCore::RenderThemeQt::adjustSliderThumbSize):
     11        Swap length and thickness for sliderthumb-vertical.
     12
    1132011-08-23  Adrienne Walker  <enne@google.com>
    214
  • trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp

    r89046 r93644  
    14921492        QStyle* qstyle = qStyle();
    14931493
    1494         int width = qstyle->pixelMetric(QStyle::PM_SliderLength, &option);
    1495         int height = qstyle->pixelMetric(QStyle::PM_SliderThickness, &option);
    1496         style->setWidth(Length(width, Fixed));
    1497         style->setHeight(Length(height, Fixed));
     1494        int length = qstyle->pixelMetric(QStyle::PM_SliderLength, &option);
     1495        int thickness = qstyle->pixelMetric(QStyle::PM_SliderThickness, &option);
     1496        if (option.orientation == Qt::Vertical) {
     1497            style->setWidth(Length(thickness, Fixed));
     1498            style->setHeight(Length(length, Fixed));
     1499        } else {
     1500            style->setWidth(Length(length, Fixed));
     1501            style->setHeight(Length(thickness, Fixed));
     1502        }
    14981503    }
    14991504}
Note: See TracChangeset for help on using the changeset viewer.