Skip to content

Commit 81820a2

Browse files
committed
Removed workaround for shadows from some menu items.
Related commits: 52d78ef and 4c54518.
1 parent 513d4f9 commit 81820a2

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

Telegram/SourceFiles/boxes/choose_filter_box.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ class FilterAction : public Ui::Menu::Action {
9999
p.drawImage(
100100
width()
101101
- size.width()
102-
- st::menuWithIcons.itemPadding.right()
103-
- st::popupMenuWithIcons.shadow.extend.right(),
102+
- st::menuWithIcons.itemPadding.right(),
104103
(height() - size.height()) / 2,
105104
_icon);
106105
}

Telegram/SourceFiles/core/phone_click_handler.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ class ResolvePhoneAction final : public Ui::Menu::ItemBase {
6464

6565
const not_null<QAction*> _dummyAction;
6666
const style::Menu &_st;
67-
const int _shadowPadding;
6867
rpl::variable<PeerData*> _peer;
6968
rpl::variable<bool> _loaded;
7069
Ui::PeerUserpicView _userpicView;
@@ -87,7 +86,6 @@ ResolvePhoneAction::ResolvePhoneAction(
8786
: ItemBase(parent, st.menu)
8887
, _dummyAction(Ui::CreateChild<QAction>(parent))
8988
, _st(st.menu)
90-
, _shadowPadding(rect::m::sum::h(st.shadow.extend))
9189
, _api(&controller->session().mtp())
9290
, _height(rect::m::sum::v(st::groupCallJoinAsPadding)
9391
+ st::groupCallJoinAsPhotoSize) {
@@ -186,9 +184,7 @@ void ResolvePhoneAction::paint(Painter &p) {
186184
width());
187185
} else {
188186
p.setPen(selected ? _st.itemFgShortcutOver : _st.itemFgShortcut);
189-
const auto w = width()
190-
- rect::m::sum::h(padding)
191-
- _shadowPadding;
187+
const auto w = width() - rect::m::sum::h(padding);
192188
_below.draw(p, Ui::Text::PaintContext{
193189
.position = QPoint(
194190
padding.left(),

0 commit comments

Comments
 (0)