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

Rename Ui::Window to Ui::RpWindow.

This commit is contained in:
John Preston 2021-07-28 16:24:11 +03:00
parent f71ce9afdf
commit 4a86b172d4
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/calls/calls_panel.cpp
View File

@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/buttons.h"
#include "ui/widgets/labels.h"
#include "ui/widgets/shadow.h"
#include "ui/widgets/window.h"
#include "ui/widgets/rp_window.h"
#include "ui/image/image.h"
#include "ui/text/format_values.h"
#include "ui/wrap/fade_wrap.h"
@ -709,7 +709,7 @@ void Panel::handleClose() {
}
}
not_null<Ui::Window*> Panel::window() const {
not_null<Ui::RpWindow*> Panel::window() const {
return _window.window();
}

4
Telegram/SourceFiles/calls/calls_panel.h
View File

@ -30,7 +30,7 @@ template <typename Widget>
class FadeWrap;
template <typename Widget>
class PaddingWrap;
class Window;
class RpWindow;
namespace GL {
enum class Backend;
} // namespace GL
@ -73,7 +73,7 @@ private:
Redial,
};
[[nodiscard]] not_null<Ui::Window*> window() const;
[[nodiscard]] not_null<Ui::RpWindow*> window() const;
[[nodiscard]] not_null<Ui::RpWidget*> widget() const;
void paint(QRect clip);

4
Telegram/SourceFiles/calls/group/calls_group_panel.cpp
View File

@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/dropdown_menu.h"
#include "ui/widgets/input_fields.h"
#include "ui/widgets/tooltip.h"
#include "ui/widgets/window.h"
#include "ui/widgets/rp_window.h"
#include "ui/chat/group_call_bar.h"
#include "ui/layers/layer_manager.h"
#include "ui/layers/generic_box.h"
@ -2221,7 +2221,7 @@ bool Panel::handleClose() {
return false;
}
not_null<Ui::Window*> Panel::window() const {
not_null<Ui::RpWindow*> Panel::window() const {
return _window.window();
}

2
Telegram/SourceFiles/calls/group/calls_group_panel.h
View File

@ -96,7 +96,7 @@ private:
};
class MicLevelTester;
[[nodiscard]] not_null<Ui::Window*> window() const;
[[nodiscard]] not_null<Ui::RpWindow*> window() const;
[[nodiscard]] not_null<Ui::RpWidget*> widget() const;
[[nodiscard]] PanelMode mode() const;

6
Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
View File

@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "calls/group/ui/desktop_capture_choose_source.h"
#include "ui/widgets/window.h"
#include "ui/widgets/rp_window.h"
#include "ui/widgets/scroll_area.h"
#include "ui/widgets/labels.h"
#include "ui/widgets/buttons.h"
@ -104,7 +104,7 @@ private:
std::unique_ptr<ChooseSourceProcess>> &Map();
const not_null<ChooseSourceDelegate*> _delegate;
const std::unique_ptr<Ui::Window> _window;
const std::unique_ptr<RpWindow> _window;
const std::unique_ptr<ScrollArea> _scroll;
const not_null<RpWidget*> _inner;
const not_null<RpWidget*> _bottom;
@ -250,7 +250,7 @@ rpl::lifetime &Source::lifetime() {
ChooseSourceProcess::ChooseSourceProcess(
not_null<ChooseSourceDelegate*> delegate)
: _delegate(delegate)
, _window(std::make_unique<Ui::Window>())
, _window(std::make_unique<RpWindow>())
, _scroll(std::make_unique<ScrollArea>(_window->body()))
, _inner(_scroll->setOwnedWidget(object_ptr<RpWidget>(_scroll.get())))
, _bottom(CreateChild<RpWidget>(_window->body().get()))

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 17123c08ab88819908480e718bbb25f4e51598f3
Subproject commit d452ae8ba6fcfc83accb6a1213a15d3e3a301740