From 458d2015dc311844a9533ac838a2f81b0a83069f Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Sun, 26 Jun 2016 16:58:18 +0200 Subject: [PATCH] Make command buffer icons same size as QLineEdit height Part of bug #10125 --- src/frontends/qt4/GuiCommandBuffer.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/frontends/qt4/GuiCommandBuffer.cpp b/src/frontends/qt4/GuiCommandBuffer.cpp index b3f56c7444..4e442f630a 100644 --- a/src/frontends/qt4/GuiCommandBuffer.cpp +++ b/src/frontends/qt4/GuiCommandBuffer.cpp @@ -94,20 +94,26 @@ GuiCommandBuffer::GuiCommandBuffer(GuiView * view) QVBoxLayout * top = new QVBoxLayout(this); QHBoxLayout * layout = new QHBoxLayout(0); - upPB = new QPushButton(qpup, "", this); - upPB->setToolTip(qt_("List of previous commands")); - upPB->setMaximumSize(24, 24); - downPB = new QPushButton(qpdown, "", this); - downPB->setToolTip(qt_("Next command")); - downPB->setMaximumSize(24, 24); - downPB->setEnabled(false); - connect(downPB, SIGNAL(clicked()), this, SLOT(down())); - connect(upPB, SIGNAL(pressed()), this, SLOT(listHistoryUp())); - edit_ = new GuiCommandEdit(this); edit_->setMinimumSize(edit_->sizeHint()); edit_->setFocusPolicy(Qt::ClickFocus); + int height = max(24, 2 * (edit_->sizeHint().height() / 2)); + QSize button_size = QSize(height, height); + QSize icon_size = button_size - QSize(4, 4); + + upPB = new QPushButton(qpup, "", this); + upPB->setToolTip(qt_("List of previous commands")); + upPB->setMaximumSize(button_size); + upPB->setIconSize(icon_size); + downPB = new QPushButton(qpdown, "", this); + downPB->setToolTip(qt_("Next command")); + downPB->setMaximumSize(button_size); + downPB->setIconSize(icon_size); + downPB->setEnabled(false); + connect(downPB, SIGNAL(clicked()), this, SLOT(down())); + connect(upPB, SIGNAL(pressed()), this, SLOT(listHistoryUp())); + connect(edit_, SIGNAL(returnPressed()), this, SLOT(dispatch())); connect(edit_, SIGNAL(tabPressed()), this, SLOT(complete())); connect(edit_, SIGNAL(upPressed()), this, SLOT(up()));