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

Adjust the height of the bottom widgets

Browse source
This commit is contained in:
Konstantinos Sideris 2018-10-06 18:07:02 +03:00
parent f58cbd7281
commit 675f1be777
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/SideBarActions.cpp
View file

@ -14,7 +14,13 @@
SideBarActions::SideBarActions(QWidget *parent) SideBarActions::SideBarActions(QWidget *parent)
: QWidget{parent} : QWidget{parent}
{ {
setFixedHeight(conf::sidebarActions::height); QFont f;
f.setPointSizeF(f.pointSizeF());
const int fontHeight = QFontMetrics(f).height();
const int contentHeight = fontHeight * 2.5;
setFixedHeight(contentHeight);
layout_ = new QHBoxLayout(this); layout_ = new QHBoxLayout(this);
layout_->setMargin(0); layout_->setMargin(0);

29
src/TextInputWidget.cpp
View file

@ -43,7 +43,6 @@
static constexpr size_t INPUT_HISTORY_SIZE = 127; static constexpr size_t INPUT_HISTORY_SIZE = 127;
static constexpr int MAX_TEXTINPUT_HEIGHT = 120; static constexpr int MAX_TEXTINPUT_HEIGHT = 120;
static constexpr int InputHeight = 24;
static constexpr int ButtonHeight = 22; static constexpr int ButtonHeight = 22;
FilteredTextEdit::FilteredTextEdit(QWidget *parent) FilteredTextEdit::FilteredTextEdit(QWidget *parent)
@ -446,7 +445,13 @@ FilteredTextEdit::showPreview(const QMimeData *source, const QStringList &format
TextInputWidget::TextInputWidget(QWidget *parent) TextInputWidget::TextInputWidget(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
setFixedHeight(conf::textInput::height); QFont f;
f.setPointSizeF(f.pointSizeF());
const int fontHeight = QFontMetrics(f).height();
const int contentHeight = fontHeight * 2.5;
const int InputHeight = fontHeight * 1.5;
setFixedHeight(contentHeight);
setCursor(Qt::ArrowCursor); setCursor(Qt::ArrowCursor);
topLayout_ = new QHBoxLayout(); topLayout_ = new QHBoxLayout();
@ -472,16 +477,20 @@ TextInputWidget::TextInputWidget(QWidget *parent)
input_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); input_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
input_->setPlaceholderText(tr("Write a message...")); input_->setPlaceholderText(tr("Write a message..."));
connect(input_, &FilteredTextEdit::heightChanged, this, [this](int height) { connect(input_,
int textInputHeight = std::min(MAX_TEXTINPUT_HEIGHT, std::max(height, InputHeight)); &FilteredTextEdit::heightChanged,
int widgetHeight = this,
std::min(MAX_TEXTINPUT_HEIGHT, std::max(height, conf::textInput::height)); [this, InputHeight, contentHeight](int height) {
int textInputHeight =
std::min(MAX_TEXTINPUT_HEIGHT, std::max(height, InputHeight));
int widgetHeight =
std::min(MAX_TEXTINPUT_HEIGHT, std::max(height, contentHeight));
setFixedHeight(widgetHeight); setFixedHeight(widgetHeight);
input_->setFixedHeight(textInputHeight); input_->setFixedHeight(textInputHeight);
emit heightChanged(widgetHeight); emit heightChanged(widgetHeight);
}); });
connect(input_, &FilteredTextEdit::showSuggestions, this, [this](const QString &q) { connect(input_, &FilteredTextEdit::showSuggestions, this, [this](const QString &q) {
if (q.isEmpty() || !cache::client()) if (q.isEmpty() || !cache::client())
return; return;