Version 4.15: Fix build with Xcode. · folkcode/tdesktop@9a012d8 · GitHub

folkcode / tdesktop Public

forked from telegramdesktop/tdesktop

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 9a012d8

Browse filesBrowse the repository at this point in the historyBrowse files

john-preston

committed

Version 4.15: Fix build with Xcode.

1 parent eaad203 commit 9a012d8
Copy full SHA for 9a012d8

2 files changed

+2-9Lines changed: 2 additions & 9 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Telegram
  • SourceFiles/boxes/peers
    • edit_peer_color_box.cpp
  • lib_webview

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp‎

Copy file name to clipboardExpand all lines: Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp

+1-8Lines changed: 1 addition & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -694,13 +694,6 @@ int ColorSelector::resizeGetHeight(int newWidth) {
694	694	return st;
695	695	}
696	696
697		- [[nodiscard]] int EmojiWidth() {
698		- }
699		-
700		- [[nodiscard]] int NoneWidth() {
701		- return st::normalFont->width(tr::lng_settings_color_emoji_off(tr::now));
702		- }
703		-
704	697	struct ButtonWithEmoji {
705	698	not_null<const style::SettingsButton*> st;
706	699	int emojiWidth = 0;
@@ -1009,7 +1002,7 @@ struct ButtonWithEmoji {
1009	1002	channel->session().changes().peerFlagsValue(
1010	1003	channel,
1011	1004	Data::PeerUpdate::Flag::EmojiSet
1012		- ) | rpl::map([=] {
	1005	+ ) | rpl::map([=]() -> rpl::producer<DocumentData*> {
1013	1006	const auto id = channel->mgInfo->emojiSet.id;
1014	1007	if (!id) {
1015	1008	return rpl::single<DocumentData*>(nullptr);

Collapse file

‎Telegram/lib_webview‎

Copy file name to clipboard

Submodule lib_webview updated 1 file

• webview/platform/mac/webview_mac.mm

  +2

0 commit comments

Comments

0 (0)