Fixed files overview thumbnails in retina. Fixed profile member list styles.

All round buttons over animations removed. Checkbox round radius smaller.
This commit is contained in:
John Preston 2016-06-10 09:54:56 +03:00
parent 3bb53b6ed1
commit bf247455ee
8 changed files with 10 additions and 9 deletions

View File

@ -59,6 +59,7 @@ windowBg: #fff; // fallback for background: white
windowActiveBg: #40ace3; // fallback for blue filled active areas
windowTextFg: #000; // fallback for text color: black
windowSubTextFg: #8a8a8a; // fallback for subtext color: gray
windowSubTextFgOver: #7c99b2; // fallback for subtext over color: gray over blue bg
windowActiveTextFg: #1485c2; // fallback for active color: blue online
windowShadowFg: #000; // fallback for shadow color
@ -1782,7 +1783,7 @@ dragHeight: 72px;
dpiSlider: slider {
color: #ccc;
thikness: 2px;
thickness: 2px;
width: 260px;
bar: sprite(0px, 104px, 9px, 22px);

View File

@ -202,7 +202,7 @@ countryInput {
slider {
color: color;
thikness: pixels;
thickness: pixels;
width: pixels;
bar: sprite;

View File

@ -707,7 +707,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
_thumbForLoaded = loaded;
ImagePixOptions options = ImagePixSmooth;
if (!_thumbForLoaded) options |= ImagePixBlurred;
_thumb = _data->thumb->pixNoCache(_thumbw, 0, options, st::overviewFileSize, st::overviewFileSize);
_thumb = _data->thumb->pixNoCache(_thumbw * cIntRetinaFactor(), 0, options, st::overviewFileSize, st::overviewFileSize);
}
p.drawPixmap(rthumb.topLeft(), _thumb);
} else {

View File

@ -148,10 +148,10 @@ profileMemberPaddingLeft: 16px;
profileMemberPhotoSize: 46px;
profileMemberPhotoPosition: point(12px, 6px);
profileMemberNamePosition: point(68px, 11px);
profileMemberNameFg: windowTextFg;
profileMemberNameFg: #222222;//windowTextFg;
profileMemberStatusPosition: point(68px, 31px);
profileMemberStatusFg: windowSubTextFg;
profileMemberStatusFgOver: windowSubTextFg;
profileMemberStatusFgOver: windowSubTextFgOver;
profileMemberStatusFgActive: windowActiveTextFg;
profileMemberAdminIcon: icon {
{ "profile_admin_star", #3babe7, point(4px, 2px) },

View File

@ -90,7 +90,7 @@ void Slider::setSelected(int32 sel) {
void Slider::paintEvent(QPaintEvent *e) {
Painter p(this);
p.fillRect(0, (height() - _st.thikness) / 2, width(), _st.thikness, _st.color->b);
p.fillRect(0, (height() - _st.thickness) / 2, width(), _st.thickness, _st.color->b);
int32 x = qFloor(_sel * float64(width() - _st.bar.pxWidth()) / (_count - 1)), y = (height() - _st.bar.pxHeight()) / 2;
p.drawSprite(QPoint(x, y), _st.bar);

View File

@ -129,7 +129,7 @@ void RoundButton::onStateChanged(int oldState, ButtonStateChangeSource source) {
a_textBgOverOpacity.start(textBgOverOpacity);
a_textFg.start(textFg->c);
if (source == ButtonByUser || source == ButtonByPress) {
if (source == ButtonByUser || source == ButtonByPress || true) {
_a_over.stop();
a_textBgOverOpacity.finish();
a_textFg.finish();

View File

@ -392,7 +392,7 @@ void BoxButton::onStateChange(int oldState, ButtonStateChangeSource source) {
a_textBgOverOpacity.start(textBgOverOpacity);
a_textFg.start(textFg->c);
if (source == ButtonByUser || source == ButtonByPress) {
if (source == ButtonByUser || source == ButtonByPress || true) {
_a_over.stop();
a_textBgOverOpacity.finish();
a_textFg.finish();

View File

@ -347,7 +347,7 @@ void Checkbox::paintEvent(QPaintEvent *e) {
} else {
p.setBrush(st::white);
}
p.drawRoundedRect(QRectF(_checkRect).marginsRemoved(QMarginsF(_st.thickness / 2, _st.thickness / 2, _st.thickness / 2, _st.thickness / 2)), st::msgRadius, st::msgRadius);
p.drawRoundedRect(QRectF(_checkRect).marginsRemoved(QMarginsF(_st.thickness / 2, _st.thickness / 2, _st.thickness / 2, _st.thickness / 2)), st::msgRadius - (_st.thickness / 2), st::msgRadius - (_st.thickness / 2));
p.setRenderHint(QPainter::HighQualityAntialiasing, false);
if (checked > 0) {