d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-26 04:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

InputBar: run clang-format

Browse source
This commit is contained in:
Marcus Hoffmann 2021-12-03 01:54:43 +01:00
parent a9d8059fb2
commit a01bc14db6
2 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/timeline/InputBar.cpp
View file

@ -155,7 +155,7 @@ InputBar::updateAtRoom(const QString &t)
} }
void void
InputBar::setText(const QString& newText) InputBar::setText(const QString &newText)
{ {
if (history_.empty()) if (history_.empty())
history_.push_front(newText); history_.push_front(newText);
@ -170,7 +170,10 @@ InputBar::setText(const QString& newText)
emit textChanged(newText); emit textChanged(newText);
} }
void void
InputBar::updateState(int selectionStart_, int selectionEnd_, int cursorPosition_, const QString& text_) InputBar::updateState(int selectionStart_,
int selectionEnd_,
int cursorPosition_,
const QString &text_)
{ {
if (text_.isEmpty()) if (text_.isEmpty())
stopTyping(); stopTyping();
@ -288,7 +291,7 @@ InputBar::openFileSelection()
} }
void void
InputBar::message(const QString& msg, MarkdownOverride useMarkdown, bool rainbowify) InputBar::message(const QString &msg, MarkdownOverride useMarkdown, bool rainbowify)
{ {
mtx::events::msg::Text text = {}; mtx::events::msg::Text text = {};
text.body = msg.trimmed().toStdString(); text.body = msg.trimmed().toStdString();
@ -352,7 +355,7 @@ InputBar::message(const QString& msg, MarkdownOverride useMarkdown, bool rainbow
} }
void void
InputBar::emote(const QString& msg, bool rainbowify) InputBar::emote(const QString &msg, bool rainbowify)
{ {
auto html = utils::markdownToHtml(msg, rainbowify); auto html = utils::markdownToHtml(msg, rainbowify);
@ -380,7 +383,7 @@ InputBar::emote(const QString& msg, bool rainbowify)
} }
void void
InputBar::notice(const QString& msg, bool rainbowify) InputBar::notice(const QString &msg, bool rainbowify)
{ {
auto html = utils::markdownToHtml(msg, rainbowify); auto html = utils::markdownToHtml(msg, rainbowify);
@ -562,7 +565,7 @@ InputBar::sticker(CombinedImagePackModel *model, int row)
} }
void void
InputBar::command(const QString& command, QString args) InputBar::command(const QString &command, QString args)
{ {
if (command == "me") { if (command == "me") {
emote(args, false); emote(args, false);
@ -591,15 +594,15 @@ InputBar::command(const QString& command, QString args)
.toStdString(); .toStdString();
member.membership = mtx::events::state::Membership::Join; member.membership = mtx::events::state::Membership::Join;
http::client()->send_state_event(room->roomId().toStdString(), http::client()->send_state_event(
http::client()->user_id().to_string(), room->roomId().toStdString(),
member, http::client()->user_id().to_string(),
[](const mtx::responses::EventId&, mtx::http::RequestErr err) { member,
if (err) [](const mtx::responses::EventId &, mtx::http::RequestErr err) {
nhlog::net()->error( if (err)
"Failed to set room displayname: {}", nhlog::net()->error("Failed to set room displayname: {}",
err->matrix_error.error); err->matrix_error.error);
}); });
} else if (command == "shrug") { } else if (command == "shrug") {
message("¯\\_(ツ)_/¯" + (args.isEmpty() ? "" : " " + args)); message("¯\\_(ツ)_/¯" + (args.isEmpty() ? "" : " " + args));
} else if (command == "fliptable") { } else if (command == "fliptable") {
@ -650,10 +653,9 @@ InputBar::command(const QString& command, QString args)
} }
void void
InputBar::showPreview(const QMimeData &source, const QString& path, const QStringList &formats) InputBar::showPreview(const QMimeData &source, const QString &path, const QStringList &formats)
{ {
auto *previewDialog_ = auto *previewDialog_ = new dialogs::PreviewUploadOverlay(ChatPage::instance());
new dialogs::PreviewUploadOverlay(ChatPage::instance());
previewDialog_->setAttribute(Qt::WA_DeleteOnClose); previewDialog_->setAttribute(Qt::WA_DeleteOnClose);
// Force SVG to _not_ be handled as an image, but as raw data // Force SVG to _not_ be handled as an image, but as raw data
@ -668,7 +670,7 @@ InputBar::showPreview(const QMimeData &source, const QString& path, const QStrin
} else if (!path.isEmpty()) } else if (!path.isEmpty())
previewDialog_->setPreview(path); previewDialog_->setPreview(path);
else if (!formats.isEmpty()) { else if (!formats.isEmpty()) {
const auto& mime = formats.first(); const auto &mime = formats.first();
previewDialog_->setPreview(source.data(mime), mime); previewDialog_->setPreview(source.data(mime), mime);
} else { } else {
setUploading(false); setUploading(false);
@ -684,7 +686,7 @@ InputBar::showPreview(const QMimeData &source, const QString& path, const QStrin
previewDialog_, previewDialog_,
&dialogs::PreviewUploadOverlay::confirmUpload, &dialogs::PreviewUploadOverlay::confirmUpload,
this, this,
[this](const QByteArray& data, const QString &mime, const QString &fn) { [this](const QByteArray &data, const QString &mime, const QString &fn) {
if (!data.size()) { if (!data.size()) {
nhlog::ui()->warn("Attempted to upload zero-byte file?! Mimetype {}, filename {}", nhlog::ui()->warn("Attempted to upload zero-byte file?! Mimetype {}, filename {}",
mime.toStdString(), mime.toStdString(),

14
src/timeline/InputBar.h
View file

@ -48,17 +48,17 @@ public slots:
[[nodiscard]] QString text() const; [[nodiscard]] QString text() const;
QString previousText(); QString previousText();
QString nextText(); QString nextText();
void setText(const QString& newText); void setText(const QString &newText);
[[nodiscard]] bool containsAtRoom() const { return containsAtRoom_; } [[nodiscard]] bool containsAtRoom() const { return containsAtRoom_; }
void send(); void send();
void paste(bool fromMouse); void paste(bool fromMouse);
void insertMimeData(const QMimeData *data); void insertMimeData(const QMimeData *data);
void updateState(int selectionStart, int selectionEnd, int cursorPosition, const QString& text); void updateState(int selectionStart, int selectionEnd, int cursorPosition, const QString &text);
void openFileSelection(); void openFileSelection();
[[nodiscard]] bool uploading() const { return uploading_; } [[nodiscard]] bool uploading() const { return uploading_; }
void message(const QString& body, void message(const QString &body,
MarkdownOverride useMarkdown = MarkdownOverride::NOT_SPECIFIED, MarkdownOverride useMarkdown = MarkdownOverride::NOT_SPECIFIED,
bool rainbowify = false); bool rainbowify = false);
void reaction(const QString &reactedEvent, const QString &reactionKey); void reaction(const QString &reactedEvent, const QString &reactionKey);
@ -75,9 +75,9 @@ signals:
void containsAtRoomChanged(); void containsAtRoomChanged();
private: private:
void emote(const QString& body, bool rainbowify); void emote(const QString &body, bool rainbowify);
void notice(const QString& body, bool rainbowify); void notice(const QString &body, bool rainbowify);
void command(const QString& name, QString args); void command(const QString &name, QString args);
void image(const QString &filename, void image(const QString &filename,
const std::optional<mtx::crypto::EncryptedFile> &file, const std::optional<mtx::crypto::EncryptedFile> &file,
const QString &url, const QString &url,
@ -101,7 +101,7 @@ private:
const QString &mime, const QString &mime,
uint64_t dsize); uint64_t dsize);
void showPreview(const QMimeData &source, const QString& path, const QStringList &formats); void showPreview(const QMimeData &source, const QString &path, const QStringList &formats);
void setUploading(bool value) void setUploading(bool value)
{ {
if (value != uploading_) { if (value != uploading_) {