Closed beta 10020001: application icon changed.

Telegram/SourceFiles/boxes/contactsbox.cpp

@@ -55,8 +55,8 @@ ContactsBox::ContactsBox(QWidget*, ChatData *chat, MembersFilter filter)
 }
 
 ContactsBox::ContactsBox(QWidget*, ChannelData *channel)
-: _creating(CreatingGroupChannel)
-, _channel(channel)
+: _channel(channel)
+, _creating(CreatingGroupChannel)
 , _select(createMultiSelect())
 , _searchTimer(this) {
 }

Telegram/SourceFiles/history/history.style

@@ -71,16 +71,18 @@ membersInnerWidth: 310px;
 membersInnerHeightMax: 360px;
 membersInnerDropdown: InnerDropdown(defaultInnerDropdown) {
 	scroll: ScrollArea(defaultSolidScroll) {
-		deltat: 3px;
-		deltab: 3px;
+		deltat: 0px;
+		deltab: 0px;
 		round: 1px;
 		width: 8px;
 		deltax: 3px;
 	}
 	scrollMargin: margins(0px, 5px, 0px, 5px);
-	scrollPadding: margins(0px, 3px, 8px, 3px);
+	scrollPadding: margins(0px, 3px, 0px, 3px);
 }
 membersInnerItem: ProfilePeerListItem {
+	left: 0px;
+	bottom: 0px;
 	button: OutlineButton {
 		outlineWidth: 0px;
 

Telegram/SourceFiles/historywidget.cpp

@@ -6398,14 +6398,14 @@ void HistoryWidget::clearInlineBot() {
 void HistoryWidget::inlineBotChanged() {
 	bool isInlineBot = _inlineBot && (_inlineBot != Ui::LookingUpInlineBot);
 	if (isInlineBot && !_inlineBotCancel) {
-		_inlineBotCancel = std_::make_unique<Ui::IconButton>(this, st::historyInlineBotCancel);
-		connect(_inlineBotCancel.get(), SIGNAL(clicked()), this, SLOT(onInlineBotCancel()));
+		_inlineBotCancel.create(this, st::historyInlineBotCancel);
+		connect(_inlineBotCancel, SIGNAL(clicked()), this, SLOT(onInlineBotCancel()));
 		_inlineBotCancel->setGeometry(_send->geometry());
 		_attachEmoji->raise();
 		updateFieldSubmitSettings();
 		updateControlsVisibility();
 	} else if (!isInlineBot && _inlineBotCancel) {
-		_inlineBotCancel = nullptr;
+		_inlineBotCancel.destroy();
 		updateFieldSubmitSettings();
 		updateControlsVisibility();
 	}
@@ -8911,3 +8911,5 @@ bool HistoryWidget::touchScroll(const QPoint &delta) {
 	_scroll->scrollToY(scNew);
 	return true;
 }
+
+HistoryWidget::~HistoryWidget() = default;

Telegram/SourceFiles/historywidget.h

@@ -721,6 +721,8 @@ public:
 	bool cmd_next_chat();
 	bool cmd_previous_chat();
 
+	~HistoryWidget();
+
 protected:
 	void resizeEvent(QResizeEvent *e) override;
 	void keyPressEvent(QKeyEvent *e) override;
@@ -1089,7 +1091,7 @@ private:
 	UserData *_inlineBot = nullptr;
 	QString _inlineBotUsername;
 	mtpRequestId _inlineBotResolveRequestId = 0;
-	std_::unique_ptr<Ui::IconButton> _inlineBotCancel;
+	object_ptr<Ui::IconButton> _inlineBotCancel = { nullptr };
 	void inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result);
 	bool inlineBotResolveFail(QString name, const RPCError &error);
 

Telegram/SourceFiles/platform/win/windows_dlls.cpp

@@ -49,6 +49,7 @@ f_SHCreateItemFromParsingName SHCreateItemFromParsingName;
 f_WTSRegisterSessionNotification WTSRegisterSessionNotification;
 f_WTSUnRegisterSessionNotification WTSUnRegisterSessionNotification;
 f_SHQueryUserNotificationState SHQueryUserNotificationState;
+f_SHChangeNotify SHChangeNotify;
 f_SetCurrentProcessExplicitAppUserModelID SetCurrentProcessExplicitAppUserModelID;
 f_RoGetActivationFactory RoGetActivationFactory;
 f_WindowsCreateStringReference WindowsCreateStringReference;
@@ -70,8 +71,13 @@ void start() {
 	load(LibShell32, "SHOpenWithDialog", SHOpenWithDialog);
 	load(LibShell32, "OpenAs_RunDLLW", OpenAs_RunDLL);
 	load(LibShell32, "SHQueryUserNotificationState", SHQueryUserNotificationState);
+	load(LibShell32, "SHChangeNotify", SHChangeNotify);
 	load(LibShell32, "SetCurrentProcessExplicitAppUserModelID", SetCurrentProcessExplicitAppUserModelID);
 
+	if (cBetaVersion() == 10020001 && SHChangeNotify) { // Temp - app icon was changed
+		SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+	}
+
 	LibUxTheme = LoadLibrary(L"UXTHEME.DLL");
 	load(LibUxTheme, "SetWindowTheme", SetWindowTheme);
 

Telegram/SourceFiles/platform/win/windows_dlls.h

@@ -63,6 +63,9 @@ extern f_OpenAs_RunDLL OpenAs_RunDLL;
 typedef HRESULT (FAR STDAPICALLTYPE *f_SHQueryUserNotificationState)(QUERY_USER_NOTIFICATION_STATE *pquns);
 extern f_SHQueryUserNotificationState SHQueryUserNotificationState;
 
+typedef void (FAR STDAPICALLTYPE *f_SHChangeNotify)(LONG wEventId, UINT uFlags, __in_opt LPCVOID dwItem1, __in_opt LPCVOID dwItem2);
+extern f_SHChangeNotify SHChangeNotify;
+
 typedef HRESULT (FAR STDAPICALLTYPE *f_SetCurrentProcessExplicitAppUserModelID)(__in PCWSTR AppID);
 extern f_SetCurrentProcessExplicitAppUserModelID SetCurrentProcessExplicitAppUserModelID;
 

Telegram/SourceFiles/profile/profile.style

@@ -117,6 +117,8 @@ profileInviteLinkText: FlatLabel(profileBlockTextPart) {
 profileLimitReachedSkip: 6px;
 
 profileMemberItem: ProfilePeerListItem {
+	left: 8px;
+	bottom: profileBlockMarginBottom;
 	button: defaultLeftOutlineButton;
 	statusFg: windowSubTextFg;
 	statusFgOver: #7c99b2;

Telegram/SourceFiles/profile/profile_block_peer_list.cpp

@@ -46,7 +46,7 @@ int PeerListWidget::resizeGetHeight(int newWidth) {
 
 	newHeight += _items.size() * st::profileMemberHeight;
 
-	return newHeight + st::profileBlockMarginBottom;
+	return newHeight + _st.bottom;
 }
 
 void PeerListWidget::setVisibleTopBottom(int visibleTop, int visibleBottom) {
@@ -251,7 +251,7 @@ void PeerListWidget::repaintRow(int index) {
 }
 
 int PeerListWidget::getListLeft() const {
-	return st::profileBlockTitlePosition.x() - st::profileMemberPaddingLeft;
+	return _st.left;
 }
 
 int PeerListWidget::rowWidth() const {

Telegram/SourceFiles/pspecific_win.cpp

@@ -828,6 +828,12 @@ void psNewVersion() {
 	if (Local::oldSettingsVersion() < 8051) {
 		AppUserModelId::checkPinned();
 	}
+	if (Local::oldSettingsVersion() > 0 && Local::oldSettingsVersion() < 10021) {
+		// Reset icons cache, because we've changed the application icon.
+		if (Dlls::SHChangeNotify) {
+			Dlls::SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+		}
+	}
 }
 
 void psExecUpdater() {

Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp

@@ -218,7 +218,7 @@ void SettingsSlider::startRipple(int sectionIndex) {
 
 QImage SettingsSlider::prepareRippleMask(int sectionIndex, const Section &section) {
 	auto size = QSize(section.width, height() - _st.rippleBottomSkip);
-	if (!_st.rippleRoundRadius || sectionIndex > 0 && sectionIndex + 1 < getSectionsCount()) {
+	if (!_st.rippleRoundRadius || (sectionIndex > 0 && sectionIndex + 1 < getSectionsCount())) {
 		return RippleAnimation::rectMask(size);
 	}
 	return RippleAnimation::maskByDrawer(size, false, [this, sectionIndex, width = section.width](QPainter &p) {

Telegram/SourceFiles/ui/widgets/widgets.style

@@ -868,6 +868,9 @@ MediaPlayerButton {
 }
 
 ProfilePeerListItem {
+	left: pixels;
+	bottom: pixels;
+
 	button: OutlineButton;
 	statusFg: color;
 	statusFgOver: color;

Telegram/Telegram/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -3,61 +3,61 @@
     {
       "size" : "16x16",
       "idiom" : "mac",
-      "filename" : "icon_16x16.png",
+      "filename" : "icon16.png",
       "scale" : "1x"
     },
     {
       "size" : "16x16",
       "idiom" : "mac",
-      "filename" : "icon_16x16@2x.png",
+      "filename" : "icon16@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "32x32",
       "idiom" : "mac",
-      "filename" : "icon_32x32.png",
+      "filename" : "icon32.png",
       "scale" : "1x"
     },
     {
       "size" : "32x32",
       "idiom" : "mac",
-      "filename" : "icon_32x32@2x.png",
+      "filename" : "icon32@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "128x128",
       "idiom" : "mac",
-      "filename" : "icon_128x128.png",
+      "filename" : "icon128.png",
       "scale" : "1x"
     },
     {
       "size" : "128x128",
       "idiom" : "mac",
-      "filename" : "icon_128x128@2x.png",
+      "filename" : "icon128@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "256x256",
       "idiom" : "mac",
-      "filename" : "icon_256x256.png",
+      "filename" : "icon256.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "256x256",
-      "filename" : "icon_256x256@2x.png",
+      "idiom" : "mac",
+      "filename" : "icon256@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
-      "filename" : "icon_512x512.png",
+      "idiom" : "mac",
+      "filename" : "icon512.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
-      "filename" : "icon_512x512@2x.png",
+      "idiom" : "mac",
+      "filename" : "icon512@2x.png",
       "scale" : "2x"
     }
   ],

Telegram/build/build.bat

@@ -44,7 +44,7 @@ set "ReleasePath=%HomePath%\..\out\Release"
 set "DeployPath=%ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStrFull%"
 set "SignPath=%HomePath%\..\..\TelegramPrivate\Sign.bat"
 set "BinaryName=Telegram"
-set "DropboxSymbolsPath=Y:\Telegram\symbols"
+set "DropboxSymbolsPath=X:\Telegram\symbols"
 
 if not exist %DropboxSymbolsPath% (
   echo Dropbox path not found!

Telegram/gyp/refresh.sh

@@ -20,7 +20,7 @@ else
   #gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode-ninja
   #gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode
   # use patched gyp with Xcode project generator
-  ../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp -Gxcode_upgrade_check_project_version=810 --format=xcode
+  ../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp -Gxcode_upgrade_check_project_version=820 --format=xcode
 fi
 
 cd ../..

Telegram/gyp/telegram_mac.gypi

@@ -62,7 +62,7 @@
     'mac_bundle': '1',
     'mac_bundle_resources': [
       '<!@(python -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")',
-      '../Telegram/Images.xcassets'
+      '../Telegram/Images.xcassets',
     ],
   }], [ 'build_macold', {
     'xcode_settings': {