RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-04-07 10:03:02 +00:00
Code Issues Projects Releases Wiki Activity

Completely refactored EditCaptionBox.

Browse Source 
Moved preview content to separate widget.
Increased caption area height.
This commit is contained in:
23rd 2021-07-09 14:59:48 +03:00 committed by John Preston
parent 47a4f4229d
commit 7e83088a84
2 changed files with 422 additions and 1026 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1358
Telegram/SourceFiles/boxes/edit_caption_box.cpp
View File

File diff suppressed because it is too large Load Diff

110
Telegram/SourceFiles/boxes/edit_caption_box.h
View File

@ -8,12 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once #pragma once
#include "boxes/abstract_box.h" #include "boxes/abstract_box.h"
#include "storage/storage_media_prepare.h"
#include "ui/wrap/slide_wrap.h"
#include "ui/chat/attach/attach_prepare.h" #include "ui/chat/attach/attach_prepare.h"
class Image;
namespace ChatHelpers { namespace ChatHelpers {
class TabbedPanel; class TabbedPanel;
} // namespace ChatHelpers } // namespace ChatHelpers
@ -23,36 +19,19 @@ class SessionController;
} // namespace Window } // namespace Window
namespace Data { namespace Data {
class Media;
class PhotoMedia; class PhotoMedia;
class DocumentMedia;
} // namespace Data } // namespace Data
namespace Ui { namespace Ui {
class AbstractButton; class AbstractSinglePreview;
class InputField; class InputField;
class EmojiButton; class EmojiButton;
class IconButton; class VerticalLayout;
class Checkbox; class FadeShadow;
enum class AlbumType; enum class AlbumType;
class AttachControlsWidget;
} // namespace Ui } // namespace Ui
namespace Window { class EditCaptionBox final : public Ui::BoxContent {
class SessionController;
} // namespace Window
namespace Media {
namespace Streaming {
class Instance;
class Document;
struct Update;
enum class Error;
struct Information;
} // namespace Streaming
} // namespace Media
class EditCaptionBox final : public Ui::BoxContent, private base::Subscriber {
public: public:
EditCaptionBox( EditCaptionBox(
QWidget*, QWidget*,
@ -69,15 +48,15 @@ protected:
void keyPressEvent(QKeyEvent *e) override; void keyPressEvent(QKeyEvent *e) override;
private: private:
void rebuildPreview();
void setupEditEventHandler();
void setupPhotoEditorEventHandler();
void setupShadows();
void setupField();
void setupControls();
void updateBoxSize(); void updateBoxSize();
void prepareStreamedPreview(); void captionResized();
void checkStreamedIsStarted();
void setupStreamedPreview(
std::shared_ptr<::Media::Streaming::Document> shared);
void handleStreamingUpdate(::Media::Streaming::Update &&update);
void handleStreamingError(::Media::Streaming::Error &&error);
void streamingReady(::Media::Streaming::Information &&info);
void startStreamedPlayer();
void setupEmojiPanel(); void setupEmojiPanel();
void updateEmojiPanelGeometry(); void updateEmojiPanelGeometry();
@ -86,74 +65,43 @@ private:
void setupDragArea(); void setupDragArea();
void save(); void save();
void captionResized();
void setName(QString nameString, qint64 size);
bool fileFromClipboard(not_null<const QMimeData*> data); bool fileFromClipboard(not_null<const QMimeData*> data);
void updateEditPreview();
void updateEditMediaButton();
void updateCaptionMaxHeight();
int errorTopSkip() const; int errorTopSkip() const;
void createEditMediaButton();
bool setPreparedList(Ui::PreparedList &&list); bool setPreparedList(Ui::PreparedList &&list);
bool isThumbedLayout() const;
inline QString getNewMediaPath() {
return _preparedList.files.empty()
? QString()
: _preparedList.files.front().path;
}
const not_null<Window::SessionController*> _controller; const not_null<Window::SessionController*> _controller;
const not_null<HistoryItem*> _historyItem;
const bool _isAllowedEditMedia = false;
const Ui::AlbumType _albumType;
FullMsgId _msgId; const base::unique_qptr<Ui::VerticalLayout> _controls;
std::shared_ptr<Data::PhotoMedia> _photoMedia; const base::unique_qptr<Ui::ScrollArea> _scroll;
std::shared_ptr<Data::DocumentMedia> _documentMedia; const base::unique_qptr<Ui::InputField> _field;
bool _thumbnailImageLoaded = false; const base::unique_qptr<Ui::EmojiButton> _emojiToggle;
Fn<void()> _refreshThumbnail; const base::unique_qptr<Ui::FadeShadow> _topShadow,_bottomShadow;
bool _animated = false;
bool _photo = false;
bool _doc = false;
QPixmap _thumb; base::unique_qptr<Ui::AbstractSinglePreview> _content;
std::unique_ptr<::Media::Streaming::Instance> _streamed;
object_ptr<Ui::InputField> _field = { nullptr };
object_ptr<Ui::EmojiButton> _emojiToggle = { nullptr };
base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel; base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
base::unique_qptr<QObject> _emojiFilter; base::unique_qptr<QObject> _emojiFilter;
base::unique_qptr<Ui::AbstractButton> _photoEditorButton;
int _thumbx = 0; std::shared_ptr<Data::PhotoMedia> _photoMedia;
int _thumbw = 0;
int _thumbh = 0;
Ui::Text::String _name;
QString _status;
bool _isAudio = false;
bool _isImage = false;
int _gifw = 0;
int _gifh = 0;
int _gifx = 0;
Ui::PreparedList _preparedList; Ui::PreparedList _preparedList;
mtpRequestId _saveRequestId = 0; mtpRequestId _saveRequestId = 0;
object_ptr<Ui::AttachControlsWidget> _editMedia = nullptr;
object_ptr<Ui::IconButton> _editFile = nullptr;
Ui::SlideWrap<Ui::RpWidget> *_wayWrap = nullptr;
Ui::SlideWrap<Ui::RpWidget> *_hintLabel = nullptr;
QString _newMediaPath;
Ui::AlbumType _albumType = Ui::AlbumType();
bool _isAllowedEditMedia = false;
bool _asFile = false; bool _asFile = false;
rpl::event_stream<> _editMediaClicks;
rpl::event_stream<> _photoEditorOpens;
QString _error; QString _error;
rpl::variable<bool> _isPhoto = false;
rpl::variable<int> _footerHeight = 0;
rpl::event_stream<> _editMediaClicks;
rpl::event_stream<> _photoEditorOpens;
rpl::event_stream<int> _contentHeight;
}; };