diff --git a/Telegram/SourceFiles/info/profile/info_levels.style b/Telegram/SourceFiles/info/profile/info_levels.style index 9d1ae14eac..9a545eb325 100644 --- a/Telegram/SourceFiles/info/profile/info_levels.style +++ b/Telegram/SourceFiles/info/profile/info_levels.style @@ -12,67 +12,68 @@ LevelShape { position: point; } levelStyle: TextStyle(defaultTextStyle) { - font: font(11px semibold); + font: font(9px semibold); } levelTextFg: windowFgActive; -levelMargin: margins(6px, 6px, 6px, 6px); +levelMargin: margins(4px, 3px, 2px, 2px); levelBase: LevelShape { - position: point(0px, 8px); + position: point(0px, 6px); } level1: LevelShape(levelBase) { - icon: icon {{ "levels/level1_inner-31x31", windowBgActive }}; + position: point(-1px, 6px); + icon: icon {{ "levels/level1_inner-26x26", windowBgActive }}; } -level2: LevelShape(levelBase) { - icon: icon {{ "levels/level2_inner-31x31", windowBgActive }}; +level2: LevelShape(level1) { + icon: icon {{ "levels/level2_inner-26x26", windowBgActive }}; } -level3: LevelShape(levelBase) { - icon: icon {{ "levels/level3_inner-31x31", windowBgActive }}; +level3: LevelShape(level1) { + icon: icon {{ "levels/level3_inner-26x26", windowBgActive }}; } -level4: LevelShape(levelBase) { - icon: icon {{ "levels/level4_inner-31x31", windowBgActive }}; +level4: LevelShape(level1) { + icon: icon {{ "levels/level4_inner-26x26", windowBgActive }}; } -level5: LevelShape(levelBase) { - icon: icon {{ "levels/level5_inner-31x31", windowBgActive }}; +level5: LevelShape(level1) { + icon: icon {{ "levels/level5_inner-26x26", windowBgActive }}; } -level6: LevelShape(levelBase) { - icon: icon {{ "levels/level6_inner-31x31", windowBgActive }}; +level6: LevelShape(level1) { + icon: icon {{ "levels/level6_inner-26x26", windowBgActive }}; } -level7: LevelShape(levelBase) { - icon: icon {{ "levels/level7_inner-31x31", windowBgActive }}; +level7: LevelShape(level1) { + icon: icon {{ "levels/level7_inner-26x26", windowBgActive }}; } -level8: LevelShape(levelBase) { - icon: icon {{ "levels/level8_inner-31x31", windowBgActive }}; +level8: LevelShape(level1) { + icon: icon {{ "levels/level8_inner-26x26", windowBgActive }}; } -level9: LevelShape(levelBase) { - icon: icon {{ "levels/level9_inner-31x31", windowBgActive }}; +level9: LevelShape(level1) { + icon: icon {{ "levels/level9_inner-26x26", windowBgActive }}; } level10: LevelShape(levelBase) { - icon: icon {{ "levels/level10_inner-31x31", windowBgActive }}; + icon: icon {{ "levels/level10_inner-26x26", windowBgActive }}; } level20: LevelShape(levelBase) { - icon: icon {{ "levels/level20_inner-31x31", windowBgActive }}; + icon: icon {{ "levels/level20_inner-26x26", windowBgActive }}; } level30: LevelShape(levelBase) { - icon: icon {{ "levels/level30_inner-31x31", windowBgActive }}; + icon: icon {{ "levels/level30_inner-26x26", windowBgActive }}; } level40: LevelShape(levelBase) { - icon: icon {{ "levels/level40_inner-31x31", windowBgActive }}; + icon: icon {{ "levels/level40_inner-26x26", windowBgActive }}; } level50: LevelShape(levelBase) { - icon: icon {{ "levels/level50_inner-31x31", windowBgActive }}; + icon: icon {{ "levels/level50_inner-26x26", windowBgActive }}; } level60: LevelShape(levelBase) { - icon: icon {{ "levels/level60_inner-31x31", windowBgActive }}; + icon: icon {{ "levels/level60_inner-26x26", windowBgActive }}; } level70: LevelShape(levelBase) { - icon: icon {{ "levels/level70_inner-31x31", windowBgActive }}; + icon: icon {{ "levels/level70_inner-26x26", windowBgActive }}; } level80: LevelShape(levelBase) { - icon: icon {{ "levels/level80_inner-31x31", windowBgActive }}; + icon: icon {{ "levels/level80_inner-26x26", windowBgActive }}; } level90: LevelShape(levelBase) { - icon: icon {{ "levels/level90_inner-31x31", windowBgActive }}; + icon: icon {{ "levels/level90_inner-26x26", windowBgActive }}; } levelNegative: LevelShape(levelBase) { icon: icon {{ "levels/level_warning-18x18", attentionButtonFg, point(6px, 7px) }}; diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp index 27293ec258..e39dec86af 100644 --- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp +++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp @@ -494,7 +494,8 @@ void StarsRating::updateData(Data::StarsRating rating) { (rating.level < 0 ? QString() : Lang::FormatCountDecimal(rating.level))); - _widthValue = _shape->icon.width() - st::levelMargin.left(); + const auto &margin = st::levelMargin; + _widthValue = _shape->icon.width() + margin.right() - margin.left(); } updateWidth(); }