diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 564d69c6e..f6d4b17cc 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
+ Version="1.0.13.0" />
Telegram Desktop
Telegram Messenger LLP
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 217476710..9157e0590 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,12,0
- PRODUCTVERSION 1,0,12,0
+ FILEVERSION 1,0,13,0
+ PRODUCTVERSION 1,0,13,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -52,10 +52,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Desktop"
- VALUE "FileVersion", "1.0.12.0"
+ VALUE "FileVersion", "1.0.13.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2017"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "1.0.12.0"
+ VALUE "ProductVersion", "1.0.13.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index e6cc0e453..8a73ec166 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,12,0
- PRODUCTVERSION 1,0,12,0
+ FILEVERSION 1,0,13,0
+ PRODUCTVERSION 1,0,13,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Desktop Updater"
- VALUE "FileVersion", "1.0.12.0"
+ VALUE "FileVersion", "1.0.13.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2017"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "1.0.12.0"
+ VALUE "ProductVersion", "1.0.13.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index a74aeb402..3c600bba3 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -922,9 +922,6 @@ void AppClass::onAppStateChanged(Qt::ApplicationState state) {
void AppClass::handleAppActivated() {
checkLocalTime();
if (_window) {
- if (_window->isHidden()) {
- _window->showFromTray();
- }
_window->updateIsActive(Global::OnlineFocusTimeout());
}
}
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index d75bdd618..c04dc3772 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#define BETA_VERSION_MACRO (0ULL)
-constexpr int AppVersion = 1000012;
-constexpr str_const AppVersionStr = "1.0.12";
+constexpr int AppVersion = 1000013;
+constexpr str_const AppVersionStr = "1.0.13";
constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index 8d5d2525b..0695c1408 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -104,6 +104,7 @@ protected:
void closeWithoutDestroy() override;
private:
+ void hideAndDeactivate();
void createGlobalMenu();
void updateTitleCounter();
void updateIconCounters();
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 635825aaf..f28c83e4a 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -220,7 +220,7 @@ void MainWindow::closeWithoutDestroy() {
_hideAfterFullScreenTimer.start(3000);
[nsWindow toggleFullScreen:nsWindow];
} else {
- [[NSApplication sharedApplication] hide: nsWindow];
+ hideAndDeactivate();
}
}
@@ -248,6 +248,11 @@ void MainWindow::titleVisibilityChangedHook() {
}
void MainWindow::onHideAfterFullScreen() {
+ hideAndDeactivate();
+}
+
+void MainWindow::hideAndDeactivate() {
+ hide();
NSWindow *nsWindow = [reinterpret_cast(winId()) window];
[[NSApplication sharedApplication] hide: nsWindow];
}
diff --git a/Telegram/SourceFiles/pspecific_mac_p.mm b/Telegram/SourceFiles/pspecific_mac_p.mm
index 647e61160..7a3eb693c 100644
--- a/Telegram/SourceFiles/pspecific_mac_p.mm
+++ b/Telegram/SourceFiles/pspecific_mac_p.mm
@@ -123,6 +123,11 @@ ApplicationDelegate *_sharedDelegate = nil;
- (void)applicationDidBecomeActive:(NSNotification *)aNotification {
if (App::app()) {
App::app()->handleAppActivated();
+ if (auto window = App::wnd()) {
+ if (window->isHidden()) {
+ window->showFromTray();
+ }
+ }
}
}
diff --git a/Telegram/build/version b/Telegram/build/version
index 0f628aefb..961d39df6 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,6 +1,6 @@
-AppVersion 1000012
+AppVersion 1000013
AppVersionStrMajor 1.0
-AppVersionStrSmall 1.0.12
-AppVersionStr 1.0.12
+AppVersionStrSmall 1.0.13
+AppVersionStr 1.0.13
AlphaChannel 0
BetaVersion 0
diff --git a/changelog.txt b/changelog.txt
index 833a7d902..897b180c7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,14 @@
+1.0.13 (20.02.17)
+
+- Bug fixes and other minor improvements.
+
+1.0.12 (19.02.17)
+
+- Support for more emoji.
+- Click and drag on waveform to play audio from a chosen moment.
+- Added Theme editor to Settings.
+- Bug fixes and other minor improvements.
+
1.0.11 alpha (17.02.17)
- Bug fixes and other minor improvements.