Use <cstdint> instead of <boost/cstdint.hpp>

[lyx.git] / src / frontends / qt4 / GuiParagraph.cpp

diff --git a/src/frontends/qt4/GuiParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp
index c3f7a9475987e9f15448201ac24ea3a26d88c542..ab6c9aef8b671cee8386a098c0244fb547c88b0b 100644 (file)
--- a/src/frontends/qt4/GuiParagraph.cpp
+++ b/src/frontends/qt4/GuiParagraph.cpp
@@ -50,6 +50,9 @@ GuiParagraph::GuiParagraph(GuiView & lv)
 {
        setupUi(this);
 
+       // fix height to minimum
+       setFixedHeight(sizeHint().height());
+
        connect(alignDefaultRB, SIGNAL(clicked()), this, SLOT(changed()));
        connect(alignJustRB, SIGNAL(clicked()), this, SLOT(changed()));
        connect(alignLeftRB, SIGNAL(clicked()), this, SLOT(changed()));
@@ -67,7 +70,6 @@ GuiParagraph::GuiParagraph(GuiView & lv)
        // foreground and are hidden when the main window is not focused.
        setWindowFlags(Qt::Tool);
        synchronizedViewCB->setChecked(true);
-       closePB->setText(qt_("&Cancel"));
 #else
        synchronizedViewCB->setChecked(false);
 #endif
@@ -305,6 +307,8 @@ void GuiParagraph::updateView()
                linespacingValue->setText(QString());
                linespacingValue->setEnabled(false);
        }
+       // Somewhere in the chain this can lose default status (#11417)
+       buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 }