procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed media overview scroll init, version 0.5.16

This commit is contained in:
John Preston 2014-08-15 16:44:01 +04:00
parent 5ebe0056dd
commit be939201fd
10 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/PrepareLinux.sh
View File

@ -1,5 +1,5 @@
AppVersionStr=0.5.15 AppVersionStr=0.5.16
AppVersion=5015 AppVersion=5016
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!" echo "Deploy folder for version $AppVersionStr already exists!"

4
Telegram/PrepareLinux32.sh
View File

@ -1,5 +1,5 @@
AppVersionStr=0.5.15 AppVersionStr=0.5.16
AppVersion=5015 AppVersion=5016
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!" echo "Deploy folder for version $AppVersionStr already exists!"

4
Telegram/PrepareMac.sh
View File

@ -1,5 +1,5 @@
AppVersionStr=0.5.15 AppVersionStr=0.5.16
AppVersion=5015 AppVersion=5016
if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!" echo "Deploy folder for version $AppVersionStr already exists!"

6
Telegram/Setup.iss
View File

@ -3,9 +3,9 @@
#define MyAppShortName "Telegram" #define MyAppShortName "Telegram"
#define MyAppName "Telegram Win (Unofficial)" #define MyAppName "Telegram Win (Unofficial)"
#define MyAppVersion "0.5.15" #define MyAppVersion "0.5.16"
#define MyAppVersionZero "0.5.15" #define MyAppVersionZero "0.5.16"
#define MyAppFullVersion "0.5.15.0" #define MyAppFullVersion "0.5.16.0"
#define MyAppPublisher "Telegram (Unofficial)" #define MyAppPublisher "Telegram (Unofficial)"
#define MyAppURL "https://tdesktop.com" #define MyAppURL "https://tdesktop.com"
#define MyAppExeName "Telegram.exe" #define MyAppExeName "Telegram.exe"

4
Telegram/SourceFiles/config.h
View File

@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
*/ */
#pragma once #pragma once
static const int32 AppVersion = 5015; static const int32 AppVersion = 5016;
static const wchar_t *AppVersionStr = L"0.5.15"; static const wchar_t *AppVersionStr = L"0.5.16";
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
static const wchar_t *AppName = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Win (Unofficial)";
#else #else

12
Telegram/SourceFiles/overviewwidget.cpp
View File

@ -614,6 +614,7 @@ OverviewWidget::OverviewWidget(QWidget *parent, const PeerData *peer, MediaOverv
, _noDropResizeIndex(false) , _noDropResizeIndex(false)
, _bg(st::msgBG) , _bg(st::msgBG)
, _showing(false) , _showing(false)
, _scrollSetAfterShow(0)
{ {
_scroll.setWidget(&_inner); _scroll.setWidget(&_inner);
_scroll.move(0, 0); _scroll.move(0, 0);
@ -677,10 +678,11 @@ void OverviewWidget::paintEvent(QPaintEvent *e) {
} }
void OverviewWidget::scrollBy(int32 add) { void OverviewWidget::scrollBy(int32 add) {
bool wasHidden = _scroll.isHidden(); if (_scroll.isHidden()) {
if (wasHidden) _scroll.show(); _scrollSetAfterShow += add;
_scroll.scrollToY(_scroll.scrollTop() + add); } else {
if (wasHidden) _scroll.hide(); _scroll.scrollToY(_scroll.scrollTop() + add);
}
} }
void OverviewWidget::paintTopBar(QPainter &p, float64 over, int32 decreaseWidth) { void OverviewWidget::paintTopBar(QPainter &p, float64 over, int32 decreaseWidth) {
@ -736,6 +738,7 @@ void OverviewWidget::animShow(const QPixmap &bgAnimCache, const QPixmap &bgAnimT
App::main()->topBar()->stopAnim(); App::main()->topBar()->stopAnim();
_animTopBarCache = myGrab(App::main()->topBar(), QRect(0, 0, width(), st::topBarHeight)); _animTopBarCache = myGrab(App::main()->topBar(), QRect(0, 0, width(), st::topBarHeight));
App::main()->topBar()->startAnim(); App::main()->topBar()->startAnim();
_scrollSetAfterShow = _scroll.scrollTop();
_scroll.hide(); _scroll.hide();
a_coord = back ? anim::ivalue(-st::introSlideShift, 0) : anim::ivalue(st::introSlideShift, 0); a_coord = back ? anim::ivalue(-st::introSlideShift, 0) : anim::ivalue(st::introSlideShift, 0);
a_alpha = anim::fvalue(0, 1); a_alpha = anim::fvalue(0, 1);
@ -761,6 +764,7 @@ bool OverviewWidget::animStep(float64 ms) {
_bgAnimCache = _animCache = _animTopBarCache = _bgAnimTopBarCache = QPixmap(); _bgAnimCache = _animCache = _animTopBarCache = _bgAnimTopBarCache = QPixmap();
App::main()->topBar()->stopAnim(); App::main()->topBar()->stopAnim();
_scroll.show(); _scroll.show();
_scroll.scrollToY(_scrollSetAfterShow);
activate(); activate();
onScroll(); onScroll();
} else { } else {

2
Telegram/SourceFiles/overviewwidget.h
View File

@ -161,5 +161,7 @@ private:
anim::ivalue a_coord, a_bgCoord; anim::ivalue a_coord, a_bgCoord;
anim::fvalue a_alpha, a_bgAlpha; anim::fvalue a_alpha, a_bgAlpha;
int32 _scrollSetAfterShow;
}; };

2
Telegram/Telegram.plist
View File

@ -11,7 +11,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.5.15</string> <string>0.5.16</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>NOTE</key> <key>NOTE</key>

BIN
Telegram/Telegram.rc
View File

Binary file not shown.

12
Telegram/Telegram.xcodeproj/project.pbxproj
View File

@ -1478,7 +1478,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.5.15; CURRENT_PROJECT_VERSION = 0.5.16;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@ -1496,7 +1496,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.5.15; CURRENT_PROJECT_VERSION = 0.5.16;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast; GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@ -1521,10 +1521,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.5.15; CURRENT_PROJECT_VERSION = 0.5.16;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.5; DYLIB_COMPATIBILITY_VERSION = 0.5;
DYLIB_CURRENT_VERSION = 0.5.15; DYLIB_CURRENT_VERSION = 0.5.16;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;
@ -1650,10 +1650,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.5.15; CURRENT_PROJECT_VERSION = 0.5.16;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.5; DYLIB_COMPATIBILITY_VERSION = 0.5;
DYLIB_CURRENT_VERSION = 0.5.15; DYLIB_CURRENT_VERSION = 0.5.16;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;