openkylin
/
qt5-ukui-platformtheme
mirror of https://gitee.com/openkylin/qt5-ukui-platformtheme.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

complete the adaptation for QSlider

This commit is contained in:
李柯 2024-11-04 16:21:57 +08:00 committed by xibowen
parent 04eefe8d2a
commit ff89d3e4f8
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
ukui-styles/qt5-config-style-ukui/ukui-config-style-parameters.cpp
View File

@ -3074,29 +3074,29 @@ void UKUIConfigStyleParameters::getDefaultConfigCheckBoxParameters(ConfigCheckBo
void UKUIConfigStyleParameters::initConfigRadioButtonParameters(bool isDark, const QStyleOption *option, const QWidget *widget) void UKUIConfigStyleParameters::initConfigRadioButtonParameters(bool isDark, const QStyleOption *option, const QWidget *widget)
{ {
m_RadioButtonParameters.radius = (widget && widget->property("normalRadius").isValid()) ? m_RadioButtonParameters.radius = (widget && widget->property("normalRadius").isValid()) ?
widget->property("normalRadius").toInt() : m_radiusStruct.normalRadius; widget->property("normalRadius").toInt() : m_dtconfig->kradiusMenu();
QPalette palette = option ? option->palette : m_stylePalette; QPalette palette = option ? option->palette : m_stylePalette;
UKUIColorTheme::RadioButtonColorCfg radioButtonColorCfg = readCfg()->radioButtonColorCfg(palette, C_RadioButton_Default); UKUIColorTheme::RadioButtonColorCfg radioButtonColorCfg = readCfg()->radioButtonColorCfg(palette, C_RadioButton_Default);
QPen defaultPen = QPen(radioButtonColorCfg.defaultPen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen defaultPen = QPen(m_dtconfig->kLineNormalAlpha(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen hoverPen = QPen(radioButtonColorCfg.hoverPen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen hoverPen = QPen(m_dtconfig->kLineNormalAlpha(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen clickPen = QPen(radioButtonColorCfg.clickPen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen clickPen = QPen(m_dtconfig->kLineNormalAlpha(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen disablePen = QPen(radioButtonColorCfg.disablePen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen disablePen = QPen(m_dtconfig->kLineDisableAlpha(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen onDefaultPen = QPen(radioButtonColorCfg.onDefaultPen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen onDefaultPen = QPen(m_dtconfig->kLineNormalAlpha(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen onHoverPen = QPen(radioButtonColorCfg.onHoverPen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen onHoverPen = QPen(m_dtconfig->kLineNormalAlpha(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen onClickPen = QPen(radioButtonColorCfg.onClickPen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen onClickPen = QPen(m_dtconfig->kLineNormalAlpha(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QBrush defaultBrush = radioButtonColorCfg.defaultBrush; QBrush defaultBrush = m_dtconfig->buttonActive();
QBrush hoverBrush = radioButtonColorCfg.hoverBrush; QBrush hoverBrush = m_dtconfig->kComponentClick();
QBrush clickBrush = radioButtonColorCfg.clickBrush; QBrush clickBrush = m_dtconfig->kComponentHover();
QBrush disableBrush = radioButtonColorCfg.disableBrush; QBrush disableBrush = m_dtconfig->buttonDisable();
QBrush onDefaultBrush = radioButtonColorCfg.onDefaultBrush; QBrush onDefaultBrush = m_dtconfig->highLightActive();
QBrush onClickBrush = radioButtonColorCfg.onClickBrush; QBrush onClickBrush = m_dtconfig->kBrandClick();
QBrush childrenOnDefaultBrush = radioButtonColorCfg.childrenOnDefaultBrush; QBrush childrenOnDefaultBrush = m_dtconfig->lightActive();
QBrush childrenOnHoverBrush = radioButtonColorCfg.childrenOnHoverBrush; QBrush childrenOnHoverBrush = m_dtconfig->lightActive();
QBrush childrenOnClickBrush = radioButtonColorCfg.childrenOnClickBrush; QBrush childrenOnClickBrush = m_dtconfig->buttonActive();
QBrush childrenOnDisableBrush = radioButtonColorCfg.childrenOnDisableBrush; QBrush childrenOnDisableBrush = QBrush(QColor(179, 179, 179));
QBrush onHoverBrush = QBrush(radioButtonColorCfg.onHoverBrush); QBrush onHoverBrush = m_dtconfig->kBrandHover();
if (radioButtonColorCfg.onHoverType == Obj_Gradient_Type) { if (radioButtonColorCfg.onHoverType == Obj_Gradient_Type) {
QLinearGradient linearGradient; QLinearGradient linearGradient;
@ -3172,8 +3172,8 @@ void UKUIConfigStyleParameters::initConfigRadioButtonParameters(bool isDark, con
normalButtonColor(isDark, palette, defaultPen, defaultBrush, hoverPen, hoverBrush, normalButtonColor(isDark, palette, defaultPen, defaultBrush, hoverPen, hoverBrush,
clickPen, clickBrush, disablePen, disableBrush); clickPen, clickBrush, disablePen, disableBrush);
defaultPen = QPen(radioButtonColorCfg.defaultPen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); defaultPen = QPen(m_dtconfig->kLineNormalAlpha(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
disablePen = QPen(radioButtonColorCfg.disablePen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); disablePen = QPen(m_dtconfig->kLineDisableAlpha(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
//on default //on default
onDefaultPen = defaultPen; onDefaultPen = defaultPen;
@ -3334,34 +3334,34 @@ void UKUIConfigStyleParameters::initConfigSliderParameters(bool isDark, const QS
UKUIColorTheme::SliderBarColorCfg sliderColorCfg = readCfg()->sliderBarColorCfg(palette, UKUIColorTheme::SliderBarColorCfg sliderColorCfg = readCfg()->sliderBarColorCfg(palette,
needTranslucent ? C_SliderBar_Translucent : C_SliderBar_Default); needTranslucent ? C_SliderBar_Translucent : C_SliderBar_Default);
QBrush handleDefaultBrush = sliderColorCfg.handleDefaultBrush; QBrush handleDefaultBrush = m_dtconfig->highLightActive();
QBrush handleHoverBrush = sliderColorCfg.handleHoverBrush; QBrush handleHoverBrush = m_dtconfig->kBrandHover();
QBrush handleClickBrush = sliderColorCfg.handleClickBrush; QBrush handleClickBrush = m_dtconfig->kBrandClick();
QBrush handleDisableBrush = sliderColorCfg.handleDisableBrush; QBrush handleDisableBrush = m_dtconfig->kGray11();
QBrush grooveValueDefaultBrush = sliderColorCfg.grooveValueDefaultBrush; QBrush grooveValueDefaultBrush = m_dtconfig->kBrandClick();
QBrush grooveValueHoverBrush = sliderColorCfg.grooveValueHoverBrush; QBrush grooveValueHoverBrush = m_dtconfig->kBrandClick();
QBrush grooveValueDisableBrush = sliderColorCfg.grooveValueDisableBrush; QBrush grooveValueDisableBrush = m_dtconfig->kGray12();
QBrush grooveUnvalueDefaultBrush = sliderColorCfg.grooveUnvalueDefaultBrush; QBrush grooveUnvalueDefaultBrush = m_dtconfig->midlightDisable();
QBrush grooveUnvalueHoverBrush = sliderColorCfg.grooveUnvalueHoverBrush; QBrush grooveUnvalueHoverBrush = m_dtconfig->midlightDisable();
QBrush grooveUnvalueDisableBrush = sliderColorCfg.grooveUnvalueDisableBrush; QBrush grooveUnvalueDisableBrush = m_dtconfig->midlightDisable();
QPen handleDefaultPen = QPen(sliderColorCfg.handleDefaultPen, (sliderColorCfg.handleDefaultPen.alpha() == 0 || QPen handleDefaultPen = QPen(m_dtconfig->kLineBrandNormal() , (sliderColorCfg.handleDefaultPen.alpha() == 0 ||
sliderColorCfg.handleDefaultPen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); sliderColorCfg.handleDefaultPen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen handleHoverPen = QPen(sliderColorCfg.handleHoverPen , (sliderColorCfg.handleHoverPen.alpha() == 0 || QPen handleHoverPen = QPen(m_dtconfig->kLineBrandNormal() , (sliderColorCfg.handleHoverPen.alpha() == 0 ||
sliderColorCfg.handleHoverPen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); sliderColorCfg.handleHoverPen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen handleClickPen = QPen(sliderColorCfg.handleClickPen , (sliderColorCfg.handleClickPen.alpha() == 0 || QPen handleClickPen = QPen(m_dtconfig->kLineBrandNormal() , (sliderColorCfg.handleClickPen.alpha() == 0 ||
sliderColorCfg.handleClickPen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); sliderColorCfg.handleClickPen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen handleDisablePen = QPen(sliderColorCfg.handleDisablePen, (sliderColorCfg.handleDisablePen.alpha() == 0 || QPen handleDisablePen = QPen(m_dtconfig->kLineBrandDisable() , (sliderColorCfg.handleDisablePen.alpha() == 0 ||
sliderColorCfg.handleDisablePen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); sliderColorCfg.handleDisablePen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen sliderGroovePen = QPen(sliderColorCfg.sliderGroovePen , (sliderColorCfg.sliderGroovePen.alpha() == 0 || QPen sliderGroovePen = QPen(sliderColorCfg.sliderGroovePen , (sliderColorCfg.sliderGroovePen.alpha() == 0 ||
sliderColorCfg.sliderGroovePen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); sliderColorCfg.sliderGroovePen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen focusPen = QPen(sliderColorCfg.focusPen , (sliderColorCfg.focusPen.alpha() == 0 || QPen focusPen = QPen(m_dtconfig->kLineBrandNormal() , (sliderColorCfg.focusPen.alpha() == 0 ||
sliderColorCfg.focusPen == Qt::NoPen) ? 0 : 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); sliderColorCfg.focusPen == Qt::NoPen) ? 0 : 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPainterPath handlePath; QPainterPath handlePath;
int radius = (widget && widget->property("normalRadius").isValid()) ? int radius = (widget && widget->property("normalRadius").isValid()) ?
widget->property("normalRadius").toInt() : m_radiusStruct.normalRadius; widget->property("normalRadius").toInt() : m_dtconfig->kradiusNormal();
const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(option); const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(option);
const bool horizontal = slider ? slider->orientation == Qt::Horizontal : false; const bool horizontal = slider ? slider->orientation == Qt::Horizontal : false;