From b63be192e64c97a3bec5080e8c98d42956a2dfca Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 14 Oct 2015 23:49:50 +0200 Subject: [PATCH] username box fixed, crash fixed, 0.9.6 hotfix stable version --- Telegram/SourceFiles/boxes/usernamebox.cpp | 6 +++--- Telegram/SourceFiles/config.h | 4 ++-- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5532 -> 5532 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Telegram/SourceFiles/boxes/usernamebox.cpp b/Telegram/SourceFiles/boxes/usernamebox.cpp index 9ee112fc5..67239a6fd 100644 --- a/Telegram/SourceFiles/boxes/usernamebox.cpp +++ b/Telegram/SourceFiles/boxes/usernamebox.cpp @@ -39,7 +39,7 @@ _about(st::boxWidth - st::usernamePadding.left()) { textstyleSet(&st::usernameTextStyle); _about.setRichText(st::boxTextFont, lang(lng_username_about)); - resizeMaxHeight(st::boxWidth, st::boxTitleHeight + st::usernamePadding.top() + _username.height() + st::usernameSkip + _about.countHeight(st::boxWidth - st::usernamePadding.left() - st::usernamePadding.right()) + 3 * st::usernameTextStyle.lineHeight + st::usernamePadding.bottom() + st::boxButtonPadding.top() + _save.height() + st::boxButtonPadding.bottom()); + resizeMaxHeight(st::boxWidth, st::boxTitleHeight + st::usernamePadding.top() + _username.height() + st::usernameSkip + _about.countHeight(st::boxWidth - st::usernamePadding.left()) + 3 * st::usernameTextStyle.lineHeight + st::usernamePadding.bottom() + st::boxButtonPadding.top() + _save.height() + st::boxButtonPadding.bottom()); textstyleRestore(); connect(&_save, SIGNAL(clicked()), this, SLOT(onSave())); @@ -102,7 +102,7 @@ void UsernameBox::paintEvent(QPaintEvent *e) { } p.setPen(st::black); textstyleSet(&st::usernameTextStyle); - int32 availw = st::boxWidth - st::usernamePadding.left() - st::usernamePadding.right(), h = _about.countHeight(availw); + int32 availw = st::boxWidth - st::usernamePadding.left(), h = _about.countHeight(availw); _about.drawLeft(p, st::usernamePadding.left(), _username.y() + _username.height() + st::usernameSkip, availw, width()); textstyleRestore(); @@ -121,7 +121,7 @@ void UsernameBox::resizeEvent(QResizeEvent *e) { _username.moveToLeft(st::usernamePadding.left(), st::boxTitleHeight + st::usernamePadding.top()); textstyleSet(&st::usernameTextStyle); - int32 availw = st::boxWidth - st::usernamePadding.left() - st::usernamePadding.right(), h = _about.countHeight(availw); + int32 availw = st::boxWidth - st::usernamePadding.left(), h = _about.countHeight(availw); textstyleRestore(); int32 linky = _username.y() + _username.height() + st::usernameSkip + h + st::usernameTextStyle.lineHeight + ((st::usernameTextStyle.lineHeight - st::boxTextFont->height) / 2); _link.moveToLeft(st::usernamePadding.left(), linky + st::usernameTextStyle.lineHeight + ((st::usernameTextStyle.lineHeight - st::boxTextFont->height) / 2)); diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 88511d3bb..14636fd97 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -20,8 +20,8 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 9005; -static const wchar_t *AppVersionStr = L"0.9.5"; +static const int32 AppVersion = 9006; +static const wchar_t *AppVersionStr = L"0.9.6"; static const bool DevVersion = false; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 78c616835..5e7b3ac5a 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.5 + 0.9.6 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 32f77ae736d00635a92fbe8407b7babd082692c8..35ef8e5e6f2b02d517707d0dc54b34ef6c448ca3 100644 GIT binary patch delta 50 zcmbQEJx6;(0WYK3