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

Merge pull request #40 from vtronko/textwidgetborder-fix

Browse source 
Don't let multiline text background overlap top border of text widget.  Fixes #39 
Thanks @vtronko
This commit is contained in:
Joseph Donofry 2019-03-03 18:35:45 -05:00 committed by GitHub
commit e3ca96000a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/TextInputWidget.cpp
View file

@ -456,7 +456,7 @@ TextInputWidget::TextInputWidget(QWidget *parent)
topLayout_ = new QHBoxLayout(); topLayout_ = new QHBoxLayout();
topLayout_->setSpacing(0); topLayout_->setSpacing(0);
topLayout_->setContentsMargins(13, 0, 13, 0); topLayout_->setContentsMargins(13, 1, 13, 0);
QIcon send_file_icon; QIcon send_file_icon;
send_file_icon.addFile(":/icons/icons/ui/paper-clip-outline.png"); send_file_icon.addFile(":/icons/icons/ui/paper-clip-outline.png");
@ -481,10 +481,10 @@ TextInputWidget::TextInputWidget(QWidget *parent)
&FilteredTextEdit::heightChanged, &FilteredTextEdit::heightChanged,
this, this,
[this, InputHeight, contentHeight](int height) { [this, InputHeight, contentHeight](int height) {
int textInputHeight =
std::min(MAX_TEXTINPUT_HEIGHT, std::max(height, InputHeight));
int widgetHeight = int widgetHeight =
std::min(MAX_TEXTINPUT_HEIGHT, std::max(height, contentHeight)); std::min(MAX_TEXTINPUT_HEIGHT, std::max(height, contentHeight));
int textInputHeight =
std::min(widgetHeight - 1, std::max(height, InputHeight));
setFixedHeight(widgetHeight); setFixedHeight(widgetHeight);
input_->setFixedHeight(textInputHeight); input_->setFixedHeight(textInputHeight);