Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

Telegram/Resources/style.txt

@@ -960,9 +960,9 @@ unreadBarColor: #538bb4;
 
 searchedBarHeight: unreadBarHeight;
 searchedBarFont: unreadBarFont;
-searchedBarBG: #f1f1f1;
+searchedBarBG: #ebeef1;
 searchedBarBorder: unreadBarBorder;
-searchedBarColor: #aaa;
+searchedBarColor: #a2aeb7;
 
 layerSlideDuration: 200;
 layerHideDuration: 200;

Telegram/Setup.iss

@@ -3,9 +3,9 @@
 
 #define MyAppShortName "Telegram"
 #define MyAppName "Telegram Win (Unofficial)"
-#define MyAppVersion "0.5.6"
-#define MyAppVersionZero "0.5.6"
-#define MyAppFullVersion "0.5.6.0"
+#define MyAppVersion "0.5.7"
+#define MyAppVersionZero "0.5.7"
+#define MyAppFullVersion "0.5.7.0"
 #define MyAppPublisher "Telegram (Unofficial)"
 #define MyAppURL "https://tdesktop.com"
 #define MyAppExeName "Telegram.exe"

Telegram/SourceFiles/historywidget.cpp

@@ -1452,11 +1452,11 @@ HistoryWidget::HistoryWidget(QWidget *parent) : QWidget(parent)
     , histPeer(0)
     , _activeHist(0)
     , histPreloading(0)
-    , _scroll(this, st::historyScroll, false)
-    , _list(0)
-    , hist(0)
 	, _loadingAroundId(-1)
 	, _loadingAroundRequest(0)
+	, _scroll(this, st::historyScroll, false)
+    , _list(0)
+    , hist(0)
     , _histInited(false)
 	, _toHistoryEnd(this, st::historyToEnd)
     , _send(this, lang(lng_send_button), st::btnSend)