|
|
@ -1308,8 +1308,7 @@ void LipstikStyle::drawKStylePrimitive(KStylePrimitive kpe,
|
|
|
|
// ------
|
|
|
|
// ------
|
|
|
|
switch( kpe ) {
|
|
|
|
switch( kpe ) {
|
|
|
|
case KPE_SliderGroove: {
|
|
|
|
case KPE_SliderGroove: {
|
|
|
|
const TQSlider* slider = (const TQSlider*)widget;
|
|
|
|
bool horizontal = ceData.orientation == TQt::Horizontal;
|
|
|
|
bool horizontal = slider->orientation() ==Qt::Horizontal;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (horizontal) {
|
|
|
|
if (horizontal) {
|
|
|
|
int center = r.y()+r.height()/2;
|
|
|
|
int center = r.y()+r.height()/2;
|
|
|
@ -1326,8 +1325,7 @@ void LipstikStyle::drawKStylePrimitive(KStylePrimitive kpe,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
case KPE_SliderHandle: {
|
|
|
|
case KPE_SliderHandle: {
|
|
|
|
const TQSlider* slider = (const TQSlider*)widget;
|
|
|
|
bool horizontal = ceData.orientation == TQt::Horizontal;
|
|
|
|
bool horizontal = slider->orientation() ==Qt::Horizontal;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const bool pressed = (flags&Style_Active);
|
|
|
|
const bool pressed = (flags&Style_Active);
|
|
|
|
const WidgetState s = enabled?(pressed?IsPressed:IsEnabled):IsDisabled;
|
|
|
|
const WidgetState s = enabled?(pressed?IsPressed:IsEnabled):IsDisabled;
|
|
|
@ -2516,15 +2514,14 @@ void LipstikStyle::drawControl(ControlElement element,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
case CE_ProgressBarContents: {
|
|
|
|
case CE_ProgressBarContents: {
|
|
|
|
const TQProgressBar *pb = dynamic_cast<const TQProgressBar*>(widget);
|
|
|
|
int steps = ceData.totalSteps;
|
|
|
|
int steps = pb->totalSteps();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const TQColor bg = enabled?cg.base():cg.background(); // background
|
|
|
|
const TQColor bg = enabled?cg.base():cg.background(); // background
|
|
|
|
const TQColor fg = enabled?cg.highlight():TQColor(cg.background().dark(110)); // foreground
|
|
|
|
const TQColor fg = enabled?cg.highlight():TQColor(cg.background().dark(110)); // foreground
|
|
|
|
|
|
|
|
|
|
|
|
if( steps == 0 ) { // Busy indicator
|
|
|
|
if( steps == 0 ) { // Busy indicator
|
|
|
|
static const int barWidth = 10;
|
|
|
|
static const int barWidth = 10;
|
|
|
|
int progress = pb->progress() % (2*(r.width()-barWidth));
|
|
|
|
int progress = ceData.currentStep % (2*(r.width()-barWidth));
|
|
|
|
if( progress < 0)
|
|
|
|
if( progress < 0)
|
|
|
|
progress = 0;
|
|
|
|
progress = 0;
|
|
|
|
if( progress > r.width()-barWidth )
|
|
|
|
if( progress > r.width()-barWidth )
|
|
|
@ -2541,7 +2538,7 @@ void LipstikStyle::drawControl(ControlElement element,
|
|
|
|
Round_UpperRight|Round_BottomRight|
|
|
|
|
Round_UpperRight|Round_BottomRight|
|
|
|
|
Round_UpperLeft|Round_BottomLeft|Is_Horizontal);
|
|
|
|
Round_UpperLeft|Round_BottomLeft|Is_Horizontal);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
double percent = static_cast<double>(pb->progress()) / static_cast<double>(steps);
|
|
|
|
double percent = static_cast<double>(ceData.currentStep) / static_cast<double>(steps);
|
|
|
|
|
|
|
|
|
|
|
|
int w = static_cast<int>(r.width() * percent);
|
|
|
|
int w = static_cast<int>(r.width() * percent);
|
|
|
|
// renderContour/renderSurface handle small sizes not very well, so set a minimal
|
|
|
|
// renderContour/renderSurface handle small sizes not very well, so set a minimal
|
|
|
|