anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix metrics of varwidth cells (#12089)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2021-01-23 15:22:09 +01:00
parent 8d09fb5bf0
commit 7f78050957
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/InsetTabular.cpp
View File

@ -1385,6 +1385,7 @@ bool Tabular::setMColumnPWidth(Cursor & cur, idx_type cell,
bool Tabular::toggleVarwidth(idx_type cell, bool const varwidth) bool Tabular::toggleVarwidth(idx_type cell, bool const varwidth)
{ {
column_info[cellColumn(cell)].varwidth = varwidth; column_info[cellColumn(cell)].varwidth = varwidth;
cellInset(cell).get()->toggleVarWidth(varwidth);
return true; return true;
} }
@ -4194,7 +4195,7 @@ Tabular::BoxType Tabular::useBox(idx_type cell) const
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
InsetTableCell::InsetTableCell(Buffer * buf) InsetTableCell::InsetTableCell(Buffer * buf)
: InsetText(buf, InsetText::PlainLayout), isFixedWidth(false), : InsetText(buf, InsetText::PlainLayout), isFixedWidth(false), isVarwidth(false),
isMultiColumn(false), isMultiRow(false), contentAlign(LYX_ALIGN_CENTER) isMultiColumn(false), isMultiRow(false), contentAlign(LYX_ALIGN_CENTER)
{} {}
@ -4288,7 +4289,7 @@ void InsetTableCell::metrics(MetricsInfo & mi, Dimension & dim) const
// We tell metrics here not to expand on multiple pars // We tell metrics here not to expand on multiple pars
// This is the difference to InsetText::Metrics // This is the difference to InsetText::Metrics
if (hasFixedWidth()) if (hasFixedWidth() || isVarwidth)
tm.metrics(mi, dim, mi.base.textwidth, false); tm.metrics(mi, dim, mi.base.textwidth, false);
else else
tm.metrics(mi, dim, 0, false); tm.metrics(mi, dim, 0, false);

4
src/insets/InsetTabular.h
View File

@ -68,6 +68,8 @@ public:
/// ///
void toggleFixedWidth(bool fw) { isFixedWidth = fw; } void toggleFixedWidth(bool fw) { isFixedWidth = fw; }
/// ///
void toggleVarWidth(bool vw) { isVarwidth = vw; }
///
void toggleMultiCol(bool m) { isMultiColumn = m; } void toggleMultiCol(bool m) { isMultiColumn = m; }
/// ///
void toggleMultiRow(bool m) { isMultiRow = m; } void toggleMultiRow(bool m) { isMultiRow = m; }
@ -123,6 +125,8 @@ private:
/// ///
bool isFixedWidth; bool isFixedWidth;
/// ///
bool isVarwidth;
///
bool isMultiColumn; bool isMultiColumn;
/// ///
bool isMultiRow; bool isMultiRow;