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

Reimplement message history

Browse source
This commit is contained in:
Nicolas Werner 2020-11-17 13:25:16 +01:00
parent 921379a4cc
commit d14a5f8067
3 changed files with 60 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/qml/MessageInput.qml
View file

@ -84,7 +84,10 @@ Rectangle {
TimelineManager.timeline.input.send();
textArea.clear();
event.accepted = true;
}
} else if (event.modifiers == Qt.ControlModifier && event.key == Qt.Key_P)
textArea.text = TimelineManager.timeline.input.previousText();
else if (event.modifiers == Qt.ControlModifier && event.key == Qt.Key_N)
textArea.text = TimelineManager.timeline.input.nextText();
}
Connections {

66
src/timeline/InputBar.cpp
View file

@ -119,39 +119,77 @@ InputBar::updateState(int selectionStart_, int selectionEnd_, int cursorPosition
else
startTyping();
if (text_ != text()) {
if (history_.empty())
history_.push_front(text_);
else
history_.front() = text_;
history_index_ = 0;
}
selectionStart = selectionStart_;
selectionEnd = selectionEnd_;
cursorPosition = cursorPosition_;
text = text_;
}
QString
InputBar::text() const
{
if (history_index_ < history_.size())
return history_.at(history_index_);
return "";
}
QString
InputBar::previousText()
{
history_index_++;
if (history_index_ >= INPUT_HISTORY_SIZE)
history_index_ = INPUT_HISTORY_SIZE;
else if (text().isEmpty())
history_index_--;
return text();
}
QString
InputBar::nextText()
{
history_index_--;
if (history_index_ >= INPUT_HISTORY_SIZE)
history_index_ = 0;
return text();
}
void
InputBar::send()
{
if (text.trimmed().isEmpty())
if (text().trimmed().isEmpty())
return;
if (history_.size() == INPUT_HISTORY_SIZE)
history_.pop_back();
history_.push_front(text);
history_index_ = 0;
if (text.startsWith('/')) {
int command_end = text.indexOf(' ');
if (text().startsWith('/')) {
int command_end = text().indexOf(' ');
if (command_end == -1)
command_end = text.size();
auto name = text.mid(1, command_end - 1);
auto args = text.mid(command_end + 1);
command_end = text().size();
auto name = text().mid(1, command_end - 1);
auto args = text().mid(command_end + 1);
if (name.isEmpty() || name == "/") {
message(args);
} else {
command(name, args);
}
} else {
message(text);
message(text());
}
nhlog::ui()->debug("Send: {}", text.toStdString());
nhlog::ui()->debug("Send: {}", text().toStdString());
if (history_.size() == INPUT_HISTORY_SIZE)
history_.pop_back();
history_.push_front("");
history_index_ = 0;
}
void

5
src/timeline/InputBar.h
View file

@ -30,6 +30,10 @@ public:
}
public slots:
QString text() const;
QString previousText();
QString nextText();
void send();
void paste(bool fromMouse);
void updateState(int selectionStart, int selectionEnd, int cursorPosition, QString text);
@ -84,7 +88,6 @@ private:
QTimer typingRefresh_;
QTimer typingTimeout_;
TimelineModel *room;
QString text;
std::deque<QString> history_;
std::size_t history_index_ = 0;
int selectionStart = 0, selectionEnd = 0, cursorPosition = 0;