From 4979ab7ab405e07b6eb17593c56f23bec436a1ae Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Sat, 14 Aug 2004 21:55:38 +0000 Subject: [PATCH] fix width of unconstrained cells in insettabular git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8935 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 3 +++ src/insets/insettabular.C | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index fb7c0e01be..c95c23cfbd 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,5 +1,8 @@ 2004-08-14 Jean-Marc Lasgouttes + * insettabular.C (metrics): when the width of a cell is zero(), + let it use as much space as it can + * insettext.C (editXY): compilation fix * insetinclude.C (priv_dispatch): fix showing dialog on mouse diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 09c47927ec..ff0d19144b 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -235,8 +235,10 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const ++cell; Dimension dim; MetricsInfo m = mi; - m.base.textwidth = - tabular.column_info[j].p_width.inPixels(mi.base.textwidth); + LyXLength p_width = tabular.column_info[j].p_width; + if (!p_width.zero()) { + m.base.textwidth = p_width.inPixels(mi.base.textwidth); + } tabular.getCellInset(cell).metrics(m, dim); maxAsc = max(maxAsc, dim.asc); maxDesc = max(maxDesc, dim.des); -- 2.39.2