2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-05 00:55:12 +00:00

Merge remote-tracking branch 'tdesktop/dev' into dev

This commit is contained in:
RadRussianRus
2020-06-26 07:25:00 +03:00
120 changed files with 1095 additions and 1019 deletions

View File

@@ -38,6 +38,7 @@ struct PeerUpdate;
namespace Data {
class WallPaper;
class CloudImageView;
} // namespace Data
namespace Dialogs {
@@ -107,7 +108,9 @@ class MainWidget
public:
using SectionShow = Window::SectionShow;
MainWidget(QWidget *parent, not_null<Window::SessionController*> controller);
MainWidget(
QWidget *parent,
not_null<Window::SessionController*> controller);
[[nodiscard]] Main::Session &session() const;
@@ -463,6 +466,8 @@ private:
int _thirdColumnWidth = 0;
Ui::Animations::Simple _a_dialogsWidth;
std::shared_ptr<Data::CloudImageView> _selfUserpicView;
object_ptr<Ui::PlainShadow> _sideShadow;
object_ptr<Ui::PlainShadow> _thirdShadow = { nullptr };
object_ptr<Ui::ResizeArea> _firstColumnResizeArea = { nullptr };