diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h index 6d49519..28426d5 100644 --- a/ui/layers/box_content.h +++ b/ui/layers/box_content.h @@ -184,6 +184,14 @@ public: return _delegate; } + void setNoContentMargin(bool noContentMargin) { + if (_noContentMargin != noContentMargin) { + _noContentMargin = noContentMargin; + setAttribute(Qt::WA_OpaquePaintEvent, !_noContentMargin); + } + getDelegate()->setNoContentMargin(noContentMargin); + } + public slots: void onScrollToY(int top, int bottom = -1); @@ -196,13 +204,6 @@ protected: getDelegate()->setLayerType(layerType); } - void setNoContentMargin(bool noContentMargin) { - if (_noContentMargin != noContentMargin) { - _noContentMargin = noContentMargin; - setAttribute(Qt::WA_OpaquePaintEvent, !_noContentMargin); - } - getDelegate()->setNoContentMargin(noContentMargin); - } void setDimensions( int newWidth, int maxHeight, diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style index a463c50..04eabf0 100644 --- a/ui/widgets/widgets.style +++ b/ui/widgets/widgets.style @@ -794,7 +794,7 @@ SettingsSlider { barFg: color; barFgActive: color; labelTop: pixels; - labelFont: font; + labelStyle: TextStyle; labelFg: color; labelFgActive: color; duration: int; @@ -812,7 +812,7 @@ defaultSettingsSlider: SettingsSlider { barFg: sliderBgInactive; barFgActive: sliderBgActive; labelTop: 17px; - labelFont: normalFont; + labelStyle: defaultTextStyle; labelFg: windowActiveTextFg; labelFgActive: windowActiveTextFg; duration: 150; @@ -824,7 +824,7 @@ defaultTabsSlider: SettingsSlider(defaultSettingsSlider) { barSkip: 0px; barFg: transparent; labelTop: 19px; - labelFont: semiboldFont; + labelStyle: semiboldTextStyle; labelFg: windowSubTextFg; labelFgActive: lightButtonFg; rippleBottomSkip: 1px;