RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
John Preston 2016-10-26 15:24:38 +03:00
parent ec6e46dae7 abd755d7fc
commit 140e6d6268
2 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Telegram/SourceFiles/ui/effects/widget_fade_wrap.h
View File

@ -62,20 +62,7 @@ private:
};
template <typename Widget>
class WidgetFadeWrap : public WidgetFadeWrap<TWidget> {
public:
WidgetFadeWrap(QWidget *parent, Widget *entity
, base::lambda_unique<void()> updateCallback
, int duration = st::widgetFadeDuration) : WidgetFadeWrap<TWidget>(parent, entity, std_::move(updateCallback), duration) {
}
Widget *entity() {
return static_cast<Widget*>(WidgetFadeWrap<TWidget>::entity());
}
const Widget *entity() const {
return static_cast<const Widget*>(WidgetFadeWrap<TWidget>::entity());
}
};
class WidgetFadeWrap;
template <>
class WidgetFadeWrap<TWidget> : public TWidget {
@ -124,4 +111,20 @@ private:
};
template <typename Widget>
class WidgetFadeWrap : public WidgetFadeWrap<TWidget> {
public:
WidgetFadeWrap(QWidget *parent, Widget *entity
, base::lambda_unique<void()> updateCallback
, int duration = st::widgetFadeDuration) : WidgetFadeWrap<TWidget>(parent, entity, std_::move(updateCallback), duration) {
}
Widget *entity() {
return static_cast<Widget*>(WidgetFadeWrap<TWidget>::entity());
}
const Widget *entity() const {
return static_cast<const Widget*>(WidgetFadeWrap<TWidget>::entity());
}
};
} // namespace Ui

33
Telegram/SourceFiles/ui/effects/widget_slide_wrap.h
View File

@ -25,21 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
namespace Ui {
template <typename Widget>
class WidgetSlideWrap : public WidgetSlideWrap<TWidget> {
public:
WidgetSlideWrap(QWidget *parent, Widget *entity
, style::margins entityPadding
, base::lambda_unique<void()> updateCallback
, int duration = st::widgetSlideDuration) : WidgetSlideWrap<TWidget>(parent, entity, entityPadding, std_::move(updateCallback), duration) {
}
Widget *entity() {
return static_cast<Widget*>(WidgetSlideWrap<TWidget>::entity());
}
const Widget *entity() const {
return static_cast<const Widget*>(WidgetSlideWrap<TWidget>::entity());
}
};
class WidgetSlideWrap;
template <>
class WidgetSlideWrap<TWidget> : public TWidget {
@ -85,4 +71,21 @@ private:
};
template <typename Widget>
class WidgetSlideWrap : public WidgetSlideWrap<TWidget> {
public:
WidgetSlideWrap(QWidget *parent, Widget *entity
, style::margins entityPadding
, base::lambda_unique<void()> updateCallback
, int duration = st::widgetSlideDuration) : WidgetSlideWrap<TWidget>(parent, entity, entityPadding, std_::move(updateCallback), duration) {
}
Widget *entity() {
return static_cast<Widget*>(WidgetSlideWrap<TWidget>::entity());
}
const Widget *entity() const {
return static_cast<const Widget*>(WidgetSlideWrap<TWidget>::entity());
}
};
} // namespace Ui