From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 4 Mar 2009 17:07:05 +0000 (+0000)
Subject: In math matrices, make sure that only the align-type tablar-feature can get a check... 
X-Git-Tag: 2.0.0~7108
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f24870ea9b31e56f1bd93925b34cc0df57a053ac;p=features.git

In math matrices, make sure that only the align-type tablar-feature can get a check box in menus (with some themes, empty check boxes are visible)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28703 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index 4e029097e8..61e13dfe8c 100644
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -1405,8 +1405,18 @@ bool InsetMathGrid::getStatus(Cursor & cur, FuncRequest const & cmd,
 		}
 		if (s == "valign-top" || s == "valign-middle" ||
 		    s == "valign-bottom" || s == "align-left" ||
-		    s == "align-right" || s == "align-center" ||
-		    s == "append-row" || s == "delete-row" ||
+		    s == "align-right" || s == "align-center") {
+			status.setEnabled(true);
+			char const ha = horizontalAlignment(cur.col());
+			char const va = verticalAlignment();
+			status.setOnOff((s == "align-left" && ha == 'l')
+					|| (s == "align-right"   && ha == 'r')
+					|| (s == "align-center"  && ha == 'c')
+					|| (s == "valign-top"    && va == 't')
+					|| (s == "valign-bottom" && va == 'b')
+					|| (s == "valign-middle" && va == 'm'));
+		}
+		if (s == "append-row" || s == "delete-row" ||
 		    s == "copy-row" || s == "swap-row" ||
 		    s == "add-hline-above" || s == "add-hline-below" ||
 		    s == "delete-hline-above" || s == "delete-hline-below" ||
@@ -1421,15 +1431,6 @@ bool InsetMathGrid::getStatus(Cursor & cur, FuncRequest const & cmd,
 				from_utf8(N_("Unknown tabular feature '%1$s'")), lyx::from_ascii(s)));
 		}
 
-		char const ha = horizontalAlignment(cur.col());
-		char const va = verticalAlignment();
-		status.setOnOff((s == "align-left" && ha == 'l')
-			   || (s == "align-right"   && ha == 'r')
-			   || (s == "align-center"  && ha == 'c')
-			   || (s == "valign-top"    && va == 't')
-			   || (s == "valign-bottom" && va == 'b')
-			   || (s == "valign-middle" && va == 'm'));
-
 #if 0
 		// FIXME: What did this code do?
 		// Please check whether it is still needed!