--- a/src/hbwidgets/sliders/hbsliderhandle.cpp Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbwidgets/sliders/hbsliderhandle.cpp Wed Aug 18 10:05:37 2010 +0300
@@ -26,6 +26,7 @@
#include "hbsliderhandle_p.h"
#include "hbslidercontrol_p.h"
#include "hbslidercontrol_p_p.h"
+#include "hbstyle_p.h"
#include <hbwidgetfeedback.h>
#include <hbstyle.h>
#include <hbstyleoptionslider_p.h>
@@ -62,12 +63,12 @@
mHandleItem(0)
{
// create handle icon item
- gItem = slider->style()->createPrimitive(HbStyle::P_Slider_thumb, this);
+ gItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_Slider_thumb, this);
HbStyle::setItemName(gItem , "icon");
setFiltersChildEvents(true) ;
// create touch area for handle
- touchItem = slider->style()->createPrimitive(HbStyle::P_SliderElement_touchhandle, this);
+ touchItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_SliderElement_touchhandle, this);
HbStyle::setItemName(touchItem , "toucharea");
setZValue(slider->zValue() + 1);
@@ -133,8 +134,8 @@
if( scene()){
if (true == sliderControl->isSliderDown()){
opt.state |= QStyle::State_Sunken;
- sliderControl->style()->updatePrimitive(
- sliderControl->primitive(HbStyle::P_Slider_groove), HbStyle::P_Slider_groove, &opt);
+ HbStylePrivate::updatePrimitive(
+ sliderControl->primitive((HbStyle::Primitive)HbStylePrivate::P_Slider_groove), HbStylePrivate::P_Slider_groove, &opt);
} else {
opt.state &= ~QStyle::State_Sunken;
}
@@ -143,7 +144,7 @@
}
opt.boundingRect=boundingRect();
- sliderControl->style()->updatePrimitive(gItem, HbStyle::P_Slider_thumb, &opt);
+ HbStylePrivate::updatePrimitive(gItem, HbStylePrivate::P_Slider_thumb, &opt);
}
void HbSliderHandle::setHandleItem(QGraphicsItem *item)
@@ -160,7 +161,7 @@
mHandleItem = item;
mHandleItem->setParentItem(this);
- sliderControl->style()->setItemName(mHandleItem,"widget");
+ HbStyle::setItemName(mHandleItem,"widget");
//((QGraphicsWidget*)mHandleItem)->setGeometry(gItem->geometry());//TODO:geometry from css
if(scene()) {
@@ -414,8 +415,8 @@
#endif
sliderBounds.adjust(0, 0, -handleBounds.width(), 0);
span = sliderBounds.width();
- sliderPos = relativePos.rx();
- sliderPos-=handleBounds.width()/2;
+ sliderPos = static_cast<int>(relativePos.x());
+ sliderPos-= static_cast<int>(handleBounds.width()/2);
} else {
#ifdef HB_EFFECTS
if( sliderBounds.topLeft().y() > relativePos.ry() ||
@@ -425,8 +426,8 @@
#endif
sliderBounds.adjust(0, 0, 0, -handleBounds.height());
span = sliderBounds.height();
- sliderPos = relativePos.ry();
- sliderPos -= handleBounds.height() / 2;
+ sliderPos = static_cast<int>(relativePos.y());
+ sliderPos -= static_cast<int>(handleBounds.height()/2);
}
int pressValue= QStyle::sliderValueFromPosition(opt.minimum, opt.maximum,
@@ -474,8 +475,8 @@
if( scene()){
if (true == sliderControl->isSliderDown()){
opt.state |= QStyle::State_Sunken;
- sliderControl->style()->updatePrimitive(
- sliderControl->primitive(HbStyle::P_Slider_groove), HbStyle::P_Slider_groove, &opt);
+ HbStylePrivate::updatePrimitive(
+ sliderControl->primitive((HbStyle::Primitive)HbStylePrivate::P_Slider_groove), HbStylePrivate::P_Slider_groove, &opt);
} else {
opt.state &= ~QStyle::State_Sunken;
}
@@ -484,8 +485,8 @@
}
opt.boundingRect=boundingRect();
- sliderControl->style()->updatePrimitive(gItem, HbStyle::P_Slider_thumb, &opt);
- sliderControl->style()->updatePrimitive(touchItem , HbStyle::P_SliderElement_touchhandle ,&opt);
+ HbStylePrivate::updatePrimitive(gItem, HbStylePrivate::P_Slider_thumb, &opt);
+ HbStylePrivate::updatePrimitive(touchItem , HbStylePrivate::P_SliderElement_touchhandle ,&opt);
sliderControl->update(boundingRect());
}
@@ -496,9 +497,9 @@
QGraphicsItem * HbSliderHandle::primitive(HbStyle::Primitive primitive) const
{
switch (primitive) {
- case HbStyle::P_Slider_thumb:
+ case HbStylePrivate::P_Slider_thumb:
return gItem;
- case HbStyle::P_SliderElement_touchhandle:
+ case HbStylePrivate::P_SliderElement_touchhandle:
return touchItem;
default:
return NULL;