Don't let multiline text background overlap top border of text widget
This commit is contained in:
parent
0c53a87488
commit
c719e01f3d
@ -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…
Reference in New Issue
Block a user