kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Merge remote-tracking branch 'origin/master' into cmake

Browse source
This commit is contained in:
John Preston 2019-12-14 17:08:20 +03:00
commit 2b9055f1ae
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ui/layers/box_content.h
View file

@ -184,6 +184,14 @@ public:
return _delegate; return _delegate;
} }
void setNoContentMargin(bool noContentMargin) {
if (_noContentMargin != noContentMargin) {
_noContentMargin = noContentMargin;
setAttribute(Qt::WA_OpaquePaintEvent, !_noContentMargin);
}
getDelegate()->setNoContentMargin(noContentMargin);
}
public slots: public slots:
void onScrollToY(int top, int bottom = -1); void onScrollToY(int top, int bottom = -1);
@ -196,13 +204,6 @@ protected:
getDelegate()->setLayerType(layerType); getDelegate()->setLayerType(layerType);
} }
void setNoContentMargin(bool noContentMargin) {
if (_noContentMargin != noContentMargin) {
_noContentMargin = noContentMargin;
setAttribute(Qt::WA_OpaquePaintEvent, !_noContentMargin);
}
getDelegate()->setNoContentMargin(noContentMargin);
}
void setDimensions( void setDimensions(
int newWidth, int newWidth,
int maxHeight, int maxHeight,

6
ui/widgets/widgets.style
View file

@ -794,7 +794,7 @@ SettingsSlider {
barFg: color; barFg: color;
barFgActive: color; barFgActive: color;
labelTop: pixels; labelTop: pixels;
labelFont: font; labelStyle: TextStyle;
labelFg: color; labelFg: color;
labelFgActive: color; labelFgActive: color;
duration: int; duration: int;
@ -812,7 +812,7 @@ defaultSettingsSlider: SettingsSlider {
barFg: sliderBgInactive; barFg: sliderBgInactive;
barFgActive: sliderBgActive; barFgActive: sliderBgActive;
labelTop: 17px; labelTop: 17px;
labelFont: normalFont; labelStyle: defaultTextStyle;
labelFg: windowActiveTextFg; labelFg: windowActiveTextFg;
labelFgActive: windowActiveTextFg; labelFgActive: windowActiveTextFg;
duration: 150; duration: 150;
@ -824,7 +824,7 @@ defaultTabsSlider: SettingsSlider(defaultSettingsSlider) {
barSkip: 0px; barSkip: 0px;
barFg: transparent; barFg: transparent;
labelTop: 19px; labelTop: 19px;
labelFont: semiboldFont; labelStyle: semiboldTextStyle;
labelFg: windowSubTextFg; labelFg: windowSubTextFg;
labelFgActive: lightButtonFg; labelFgActive: lightButtonFg;
rippleBottomSkip: 1px; rippleBottomSkip: 1px;