AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Fix the QSlider handler position.

Browse Source 
Change-Id: I300f187a94d6c2b6b385c5a129150344f6b805ea
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
This commit is contained in:
BogDan Vatra 2013-10-25 16:34:33 +03:00 committed by The Qt Project
parent 746f7a5b28
commit 9b9c63c27d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/widgets/styles/qandroidstyle.cpp
View File

@ -696,7 +696,10 @@ int QAndroidStyle::styleHint(QStyle::StyleHint hint, const QStyleOption *option,
{
switch (hint) {
case SH_Slider_AbsoluteSetButtons:
return 1;
return Qt::LeftButton;
case SH_Slider_PageSetButtons:
return 0;
case SH_RequestSoftwareInputPanel:
return RSIP_OnMouseClick;
@ -1776,9 +1779,9 @@ QRect QAndroidStyle::AndroidSeekBarControl::subControlRect(const QStyleOptionCom
drawable = static_cast<const QAndroidStyle::AndroidStateDrawable *>(m_seekBarThumb)->bestAndroidStateMatch(option);
QRect r(option->rect);
double factor = double(styleOption->sliderPosition/(styleOption->maximum-styleOption->minimum));
int pos=(double(option->rect.width()*factor - drawable->size().width()) / 2);
r.setX(r.x()+pos);
double factor = double(styleOption->sliderPosition) / (styleOption->maximum - styleOption->minimum);
int pos = option->rect.width() * factor - double(drawable->size().width() / 2);
r.setX(r.x() + pos);
r.setSize(drawable->size());
return r;
}