Skip to content

LT-21004: Fix text alignment when ‘Sorted from End’ #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mark-sil merged 1 commit into from
Feb 18, 2026
Merged

LT-21004: Fix text alignment when ‘Sorted from End’ #681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions Src/views/VwTextBoxes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3186,10 +3186,12 @@ class ParaBuilder
// If there are inner piles in the line, align their corresponding components
IntVec vdyBaselines; // item is position of nth baseline
bool fNeedAdjust = false;
bool bContainsInnerPileBox = false;
for (pbox = m_pboxStartLine; ; pbox = pbox->Next())
{
if (pbox->IsInnerPileBox())
{
bContainsInnerPileBox = true;
int irow = 0;
pbox->ComputeInnerPileBaselines(m_pvpbox, vdyBaselines, 0, irow, fNeedAdjust);
}
Expand Down Expand Up @@ -3268,11 +3270,18 @@ class ParaBuilder
break;
case ktalRight:
if (m_pvpbox->RightToLeft()) {
xPos = m_dxTrail + dxAlignMentAdjust;
xPos = m_dxTrail;
}
else {
xPos = m_dxLead + dxAlignMentAdjust;
xPos = m_dxLead;
}

// Only add the adjustment if this box does not contain an inner pile. (LT-21004)
if (!bContainsInnerPileBox)
{
xPos += dxAlignMentAdjust;
}

xSpaceUsed = xPos;
dxExtraWidthRight = m_dxLead;
break;
Expand Down Expand Up @@ -9993,10 +10002,6 @@ void VwConcParaBox::DoSpecialAlignment(IVwGraphics * pvg)
{
if (m_cpo & kcpoAlign)
{
// For now we can only do align left.
// The trick otherwise is not just to do our alignment, but to undo what the
// superclass Layout did.
Assert(m_qzvps->ParaAlign() == ktalLeft || m_qzvps->ParaAlign() == ktalLeading);
// Figure out where the key word is naturally displayed.
// First find the box it is part of.
VwStringBox * psbox = NULL;
Expand Down
Loading