luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix render of Slider controls with Breeze theme.

Browse source 
[GB.QT4]
* BUG: Fix render of Slider controls with Breeze theme.

[GB.QT5]
* BUG: Fix render of Slider controls with Breeze theme.
This commit is contained in:
gambas 2018-03-03 03:12:24 +01:00
parent 3f2838c609
commit c6587f6116
1 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gb.qt4/src/fix_breeze.cpp
View file

@ -124,6 +124,20 @@ QRect FixBreezeStyle::subControlRect(ComplexControl element, const QStyleOptionC
return visualRect( option, labelRect );
}
}
else if (element == CC_Slider)
{
const QStyleOptionSlider *sliderOption( qstyleoption_cast<const QStyleOptionSlider*>( option ) );
const bool horizontal( sliderOption->orientation == Qt::Horizontal );
QRect result(QProxyStyle::subControlRect(element, option, subControl, widget));
if (horizontal)
result.moveTop((widget->height() - result.height()) / 2);
else
result.moveLeft((widget->width() - result.width()) / 2);
return result;
}
return QProxyStyle::subControlRect(element, option, subControl, widget);
}
@ -185,12 +199,8 @@ void FixBreezeStyle::drawComplexControl(ComplexControl element, const QStyleOpti
}
}
}
QProxyStyle::drawComplexControl(element, option, painter, widget);
return;
}
if (element == CC_ComboBox)
else if (element == CC_ComboBox)
{
QStyleOptionComboBox newOption;
const QStyleOptionComboBox* comboBoxOption( qstyleoption_cast<const QStyleOptionComboBox*>( option ) );
@ -209,9 +219,30 @@ void FixBreezeStyle::drawComplexControl(ComplexControl element, const QStyleOpti
}
}
}
QProxyStyle::drawComplexControl(element, option, painter, widget);
return;
}
else if (element == CC_Slider)
{
//QStyleOptionSlider newOption;
const QStyleOptionSlider *sliderOption( qstyleoption_cast<const QStyleOptionSlider*>( option ) );
const bool horizontal( sliderOption->orientation == Qt::Horizontal );
if (!(sliderOption->subControls & SC_SliderTickmarks))
{
QRect handle(QProxyStyle::subControlRect(element, option, SC_SliderHandle, widget));
//newOption = *sliderOption;
//option = &newOption;
painter->save();
if (horizontal)
painter->translate(0, (widget->height() - handle.height()) / 2);
else
painter->translate((option->rect.width() - handle.width()) / 2, 0);
//newOption.rect = QRect(newOption.rect.x(), (newOption.rect.height() - handle.height()) / 2, newOption.rect.width(), handle.height());
QProxyStyle::drawComplexControl(element, option, painter, widget);
painter->restore();
return;
}
}
QProxyStyle::drawComplexControl(element, option, painter, widget);