Merge pull request #40 from vtronko/textwidgetborder-fix

Don't let multiline text background overlap top border of text widget.  Fixes #39 
Thanks @vtronko
remotes/origin/HEAD
Joseph Donofry 6 years ago committed by GitHub
commit e3ca96000a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/TextInputWidget.cpp

@ -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);

Loading…
Cancel
Save