diff --git a/Telegram/Resources/basic.style b/Telegram/Resources/basic.style index e39737523d..a4b20b3f77 100644 --- a/Telegram/Resources/basic.style +++ b/Telegram/Resources/basic.style @@ -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); diff --git a/Telegram/Resources/basic_types.style b/Telegram/Resources/basic_types.style index 000dec9fcb..30d53110aa 100644 --- a/Telegram/Resources/basic_types.style +++ b/Telegram/Resources/basic_types.style @@ -202,7 +202,7 @@ countryInput { slider { color: color; - thikness: pixels; + thickness: pixels; width: pixels; bar: sprite; diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp index 64cb93cab5..59faa38b1c 100644 --- a/Telegram/SourceFiles/overview/overview_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_layout.cpp @@ -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 { diff --git a/Telegram/SourceFiles/profile/profile.style b/Telegram/SourceFiles/profile/profile.style index 8c3de42fc9..46a7c85640 100644 --- a/Telegram/SourceFiles/profile/profile.style +++ b/Telegram/SourceFiles/profile/profile.style @@ -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) }, diff --git a/Telegram/SourceFiles/settingswidget.cpp b/Telegram/SourceFiles/settingswidget.cpp index ee290cbdc6..a8229447b2 100644 --- a/Telegram/SourceFiles/settingswidget.cpp +++ b/Telegram/SourceFiles/settingswidget.cpp @@ -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); diff --git a/Telegram/SourceFiles/ui/buttons/round_button.cpp b/Telegram/SourceFiles/ui/buttons/round_button.cpp index 758d7efb71..3897b5a021 100644 --- a/Telegram/SourceFiles/ui/buttons/round_button.cpp +++ b/Telegram/SourceFiles/ui/buttons/round_button.cpp @@ -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(); diff --git a/Telegram/SourceFiles/ui/flatbutton.cpp b/Telegram/SourceFiles/ui/flatbutton.cpp index 8255e7159b..ea71b1cee1 100644 --- a/Telegram/SourceFiles/ui/flatbutton.cpp +++ b/Telegram/SourceFiles/ui/flatbutton.cpp @@ -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(); diff --git a/Telegram/SourceFiles/ui/flatcheckbox.cpp b/Telegram/SourceFiles/ui/flatcheckbox.cpp index d1d64ab1f5..6e082f890d 100644 --- a/Telegram/SourceFiles/ui/flatcheckbox.cpp +++ b/Telegram/SourceFiles/ui/flatcheckbox.cpp @@ -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) {