From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sat, 17 Mar 2012 23:05:15 +0000 (+0100)
Subject: Fix bug #8083: Fix the selection of cells below multirows
X-Git-Tag: 2.0.4~168
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cddd90dfdffe1a717a6844df551618fe49103c58;p=features.git

Fix bug #8083: Fix the selection of cells below multirows

Multirows were introduced in 8bb69f24 (Uwe Stoehr, 11 Feb 2010). In the
computation of the nearest cell, it was forgotten to account for the
vertical offset. tabular.cellHeight is the full height of the cell, while
the point that comes from the coordCache is offsetted by VOffset.
Therefore, we have to subtract the VOffset from o.y_.
---

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 1569999c4c..508ad732de 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -4902,7 +4902,7 @@ int InsetTabular::dist(BufferView & bv, idx_type const cell, int x, int y) const
 	int const xend = xbeg + tabular.cellWidth(cell);
 	row_type const row = tabular.cellRow(cell);
 	int const ybeg = o.y_ - tabular.rowAscent(row)
-		- tabular.interRowSpace(row);
+		- tabular.interRowSpace(row) - tabular.textVOffset(cell);
 	int const yend = ybeg + tabular.cellHeight(cell);
 
 	if (x < xbeg)
diff --git a/status.20x b/status.20x
index 72a00437f6..943d02a231 100644
--- a/status.20x
+++ b/status.20x
@@ -101,6 +101,8 @@ What's new
 
 - Do not repeatedly show export errors of a previous export.
 
+- Fix the selection of rows below a multirow (bug 8083).
+
 
 * DOCUMENTATION AND LOCALIZATION