anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 06:15:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Center correctly centered top labels (e.g. abstract)"

Browse Source 
This reverts commit 6c1855313c.
This commit is contained in:
Jean-Marc Lasgouttes 2021-01-05 15:14:41 +01:00
parent 6c1855313c
commit b8188e54dd
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/layouts/stdstruct.inc
View File

@ -27,12 +27,13 @@ Style Abstract
Align Block
LabelType Centered
LabelString "Abstract"
LabelBottomSep 0.2
LabelBottomSep 0.5
Font
Size Small
EndFont
LabelFont
Series Bold
Size Large
EndFont
HTMLLabelFirst 1
HTMLForceCSS 1

4
src/RowPainter.cpp
View File

@ -462,8 +462,8 @@ void RowPainter::paintTopLevelLabel() const
* respect to the left and right margins.
*/
int const leftm = row_.isRTL() ? tm_.rightMargin(row_.pit())
: tm_.leftMargin(row_.pit(), 1);
int const rightm = row_.isRTL() ? tm_.leftMargin(row_.pit(), 1)
: tm_.leftMargin(row_.pit());
int const rightm = row_.isRTL() ? tm_.leftMargin(row_.pit())
: tm_.rightMargin(row_.pit());
x += leftm - row_.left_margin + (tm_.width() - leftm -rightm) / 2
- fm.width(str) / 2;

9
src/TextMetrics.cpp
View File

@ -1610,10 +1610,7 @@ int TextMetrics::leftMargin(pit_type const pit, pos_type const pos) const
LASSERT(pit < int(pars.size()), return 0);
Paragraph const & par = pars[pit];
LASSERT(pos >= 0, return 0);
// We do not really care whether pos > par.size(), since we do not
// access the data. It can be actially useful, when querying the
// margin without indentation (see RowPainter::paintTopLevelLabel).
LASSERT(pos <= par.size(), return 0);
Buffer const & buffer = bv_->buffer();
//lyxerr << "TextMetrics::leftMargin: pit: " << pit << " pos: " << pos << endl;
DocumentClass const & tclass = buffer.params().documentClass();
@ -1767,8 +1764,8 @@ int TextMetrics::leftMargin(pit_type const pit, pos_type const pos) const
&& !text_->inset().neverIndent()
// display style insets do not need indentation
&& !(!par.empty()
&& par.isInset(0)
&& par.getInset(0)->rowFlags() & Inset::Display)
&& par.isInset(pos)
&& par.getInset(pos)->rowFlags() & Inset::Display)
&& (!(tclass.isDefaultLayout(par.layout())
|| tclass.isPlainLayout(par.layout()))
|| buffer.params().paragraph_separation