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

Fix right and left layout alignment (in workarea) with RTL

Browse Source 
Fixes: #11606
This commit is contained in:
Juergen Spitzmueller 2019-07-10 14:50:08 +02:00
parent 0922aa0072
commit b6f0c1de3d
6 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Paragraph.cpp
View File

@ -1983,15 +1983,29 @@ depth_type Paragraph::getMaxDepthAfter() const
}
LyXAlignment Paragraph::getAlign() const
LyXAlignment Paragraph::getAlign(BufferParams const & bparams) const
{
if (d->params_.align() == LYX_ALIGN_LAYOUT)
return d->layout_->align;
return getDefaultAlign(bparams);
else
return d->params_.align();
}
LyXAlignment Paragraph::getDefaultAlign(BufferParams const & bparams) const
{
LyXAlignment res = layout().align;
if (isRTL(bparams)) {
// Swap sides
if (res == LYX_ALIGN_LEFT)
res = LYX_ALIGN_RIGHT;
else if (res == LYX_ALIGN_RIGHT)
res = LYX_ALIGN_LEFT;
}
return res;
}
docstring const & Paragraph::labelString() const
{
return d->params_.labelString();

4
src/Paragraph.h
View File

@ -312,7 +312,9 @@ public:
/// Set label width string.
void setLabelWidthString(docstring const & s);
/// Actual paragraph alignment used
LyXAlignment getAlign() const;
LyXAlignment getAlign(BufferParams const &) const;
/// Default paragraph alignment as determined by layout
LyXAlignment getDefaultAlign(BufferParams const &) const;
/// The nesting depth of a paragraph
depth_type getDepth() const;
/// The maximal possible depth of a paragraph after this one

4
src/TextMetrics.cpp
View File

@ -595,7 +595,7 @@ bool TextMetrics::redoParagraph(pit_type const pit, bool const align_rows)
LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const
{
LyXAlignment align = par.getAlign();
LyXAlignment align = par.getAlign(bv_->buffer().params());
// handle alignment inside tabular cells
Inset const & owner = text_->inset();
@ -1755,7 +1755,7 @@ int TextMetrics::leftMargin(pit_type const pit, pos_type const pos) const
if (!par.params().leftIndent().zero())
l_margin += par.params().leftIndent().inPixels(max_width_, lfm.em());
LyXAlignment align = par.getAlign();
LyXAlignment align = par.getAlign(bv_->buffer().params());
// set the correct parindent
if (pos == 0

8
src/frontends/qt4/GuiParagraph.cpp
View File

@ -125,7 +125,7 @@ void GuiParagraph::checkAlignmentRadioButtons()
alignDefaultRB->setText(alignDefaultLabel_);
else
alignDefaultRB->setText(alignDefaultLabel_ + " ("
+ labelMap_[alignDefault()] + ")");
+ labelMap_[bufferview()->cursor().innerParagraph().getDefaultAlign(buffer().params())] + ")");
}
@ -372,12 +372,6 @@ LyXAlignment GuiParagraph::alignPossible() const
}
LyXAlignment GuiParagraph::alignDefault() const
{
return bufferview()->cursor().innerParagraph().layout().align;
}
bool GuiParagraph::hasLabelwidth() const
{
Layout layout = bufferview()->cursor().innerParagraph().layout();

2
src/frontends/qt4/GuiParagraph.h
View File

@ -60,8 +60,6 @@ private:
bool hasLabelwidth() const;
///
LyXAlignment alignPossible() const;
///
LyXAlignment alignDefault() const;
private Q_SLOTS:
///

12
src/output_latex.cpp
View File

@ -1402,20 +1402,20 @@ void TeXOnePar(Buffer const & buf,
&& !text.inset().getLayout().parbreakIgnored()
&& style.latextype != LATEX_ITEM_ENVIRONMENT
&& style.latextype != LATEX_LIST_ENVIRONMENT
&& style.align == par.getAlign()
&& style.align == par.getAlign(bparams)
&& nextpar->getDepth() == par.getDepth()
&& nextpar->getAlign() == par.getAlign())
&& nextpar->getAlign(bparams) == par.getAlign(bparams))
|| (!next_layout.isEnvironment()
&& nextpar->getDepth() > par.getDepth()
&& nextpar->getAlign() == next_layout.align)
&& nextpar->getAlign(bparams) == next_layout.align)
|| (!style.isEnvironment()
&& next_layout.latextype == LATEX_ENVIRONMENT
&& nextpar->getDepth() < par.getDepth())
|| (style.isCommand()
&& !next_layout.isEnvironment()
&& style.align == par.getAlign()
&& next_layout.align == nextpar->getAlign())
|| (style.align != par.getAlign()
&& style.align == par.getAlign(bparams)
&& next_layout.align == nextpar->getAlign(bparams))
|| (style.align != par.getAlign(bparams)
&& tclass.isDefaultLayout(next_layout))) {
os << '\n';
}