From: Enrico Forestieri <forenr@lyx.org>
Date: Sun, 8 Jun 2014 21:59:59 +0000 (+0200)
Subject: Fix bug #9153 (Using mathpanel to insert matrix creates extra space on top)
X-Git-Tag: 2.1.1~27
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=970da7c5e275c7bed3bf14aadd4f7c5bed4b1850;p=features.git

Fix bug #9153 (Using mathpanel to insert matrix creates extra space on top)

The code was setting the current index before filling the
combo box items.
---

diff --git a/src/frontends/qt4/GuiMathMatrix.cpp b/src/frontends/qt4/GuiMathMatrix.cpp
index 8106629d99..457b749f5b 100644
--- a/src/frontends/qt4/GuiMathMatrix.cpp
+++ b/src/frontends/qt4/GuiMathMatrix.cpp
@@ -63,6 +63,11 @@ GuiMathMatrix::GuiMathMatrix(GuiView & lv)
 {
 	setupUi(this);
 
+	for (int i = 0; *VertAligns[i]; ++i)
+		valignCO->addItem(qt_(VertAligns[i]));
+	for (int i = 0; *DecoChars[i]; ++i)
+		decorationCO->addItem(qt_(DecoChars[i]));
+
 	table->setMinimumSize(100, 100);
 	rowsSB->setValue(5);
 	columnsSB->setValue(5);
@@ -91,11 +96,6 @@ GuiMathMatrix::GuiMathMatrix(GuiView & lv)
 	connect(decorationCO, SIGNAL(activated(int)),
 		this, SLOT(decorationChanged(int)));
 
-	for (int i = 0; *VertAligns[i]; ++i)
-		valignCO->addItem(qt_(VertAligns[i]));
-	for (int i = 0; *DecoChars[i]; ++i)
-		decorationCO->addItem(qt_(DecoChars[i]));
-
 	bc().setPolicy(ButtonPolicy::IgnorantPolicy);
 }
 
diff --git a/status.21x b/status.21x
index 97fc377977..c86f5da929 100644
--- a/status.21x
+++ b/status.21x
@@ -155,6 +155,9 @@ We have fixed several significant issues involving conversion of 2.0
 
 - Fix keyborad input of cyrillic characters in program listings (bug 9102).
 
+- Fix default vertical alignment when inserting a math matrix through the
+  math toolbar or context menu (bug 9153).
+
 
 * INTERNALS