diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index f28a5995af..c116da7ef0 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,8 +1,8 @@ @echo OFF -set "AppVersionStrSmall=0.7.7" -set "AppVersionStr=0.7.7" -set "AppVersionStrFull=0.7.7.0" +set "AppVersionStrSmall=0.7.8" +set "AppVersionStr=0.7.8" +set "AppVersionStrFull=0.7.8.0" echo. echo Preparing version %AppVersionStr%.. diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt index 55c936d29e..8cb4691c52 100644 --- a/Telegram/Resources/style.txt +++ b/Telegram/Resources/style.txt @@ -222,7 +222,7 @@ cbDefFlat: flatCheckbox { imageRect: sprite(140px, 68px, 22px, 22px); chkImageRect: sprite(115px, 68px, 22px, 22px); - overImageRect: sprite(140px, 68px, 22px, 22px); + overImageRect: sprite(190px, 68px, 22px, 22px); chkOverImageRect: sprite(115px, 68px, 22px, 22px); disImageRect: sprite(140px, 43px, 22px, 22px); chkDisImageRect: sprite(115px, 43px, 22px, 22px); diff --git a/Telegram/SourceFiles/art/sprite.png b/Telegram/SourceFiles/art/sprite.png index a343b058b1..25c31ec9e3 100644 Binary files a/Telegram/SourceFiles/art/sprite.png and b/Telegram/SourceFiles/art/sprite.png differ diff --git a/Telegram/SourceFiles/art/sprite_200x.png b/Telegram/SourceFiles/art/sprite_200x.png index 5772172d42..2e0db7e59a 100644 Binary files a/Telegram/SourceFiles/art/sprite_200x.png and b/Telegram/SourceFiles/art/sprite_200x.png differ diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index f88b57f3b5..cc85ebb17c 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 7007; -static const wchar_t *AppVersionStr = L"0.7.7"; +static const int32 AppVersion = 7008; +static const wchar_t *AppVersionStr = L"0.7.8"; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index bad49f23d8..5a70e5ba70 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -381,7 +381,7 @@ void HistoryList::dragActionStart(const QPoint &screenPos, Qt::MouseButton butto if (_selected.cbegin().value() == FullItemSel) { if (_selected.constFind(_dragItem) != _selected.cend() && App::hoveredItem()) { _dragAction = PrepareDrag; // start items drag - } else { + } else if (!_dragWasInactive) { _dragAction = PrepareSelect; // start items select } } @@ -428,7 +428,7 @@ void HistoryList::dragActionStart(const QPoint &screenPos, Qt::MouseButton butto } if (uponSelected) { _dragAction = PrepareDrag; // start text drag - } else { + } else if (!_dragWasInactive) { if (afterDragSymbol) ++_dragSymbol; uint32 selStatus = (_dragSymbol << 16) | _dragSymbol; if (selStatus != FullItemSel && (_selected.isEmpty() || _selected.cbegin().value() != FullItemSel)) { @@ -443,7 +443,7 @@ void HistoryList::dragActionStart(const QPoint &screenPos, Qt::MouseButton butto _dragAction = PrepareSelect; } } - } else { + } else if (!_dragWasInactive) { _dragAction = PrepareSelect; // start items select } } @@ -594,6 +594,8 @@ void HistoryList::mouseDoubleClickEvent(QMouseEvent *e) { _trippleClickPoint = e->globalPos(); _trippleClickTimer.start(QApplication::doubleClickInterval()); } + } else { + mousePressEvent(e); } } diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index c65c85d496..7ca2e3409c 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.7.7 + 0.7.8 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 7e22ced64f..633d4c91fa 100644 Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 0b7946f447..a61ae53b44 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1625,7 +1625,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.7; + CURRENT_PROJECT_VERSION = 0.7.8; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1643,7 +1643,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.7.7; + CURRENT_PROJECT_VERSION = 0.7.8; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1669,10 +1669,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.7; + CURRENT_PROJECT_VERSION = 0.7.8; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.7; - DYLIB_CURRENT_VERSION = 0.7.7; + DYLIB_CURRENT_VERSION = 0.7.8; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1812,10 +1812,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.7; + CURRENT_PROJECT_VERSION = 0.7.8; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.7; - DYLIB_CURRENT_VERSION = 0.7.7; + DYLIB_CURRENT_VERSION = 0.7.8; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; diff --git a/Telegram/Version.sh b/Telegram/Version.sh index 57d03dae3b..126b22118b 100755 --- a/Telegram/Version.sh +++ b/Telegram/Version.sh @@ -1,2 +1,2 @@ -echo 7007 0.7.7 +echo 7008 0.7.8