29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
From b6e97aeb2541f770fe114467259df44e46413862 Mon Sep 17 00:00:00 2001
|
|
From: Michael Reeves <reeves.87@gmail.com>
|
|
Date: Sun, 29 Jun 2025 22:02:14 -0400
|
|
Subject: [PATCH] Revert unitended condition change
|
|
|
|
---
|
|
src/difftextwindow.cpp | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp
|
|
index 4de52e834..e753125a2 100644
|
|
--- a/src/difftextwindow.cpp
|
|
+++ b/src/difftextwindow.cpp
|
|
@@ -557,12 +557,13 @@ qint32 DiffTextWindow::getMaxTextWidth()
|
|
/*
|
|
mDiff3LineVector is null when qt sends a resize event before init. Default to fixed size in this case.
|
|
*/
|
|
- if(d->mDiff3LineVector == nullptr || !d->m_bWordWrap)
|
|
+ if(d->mDiff3LineVector == nullptr || d->m_bWordWrap)
|
|
{
|
|
return getVisibleTextAreaWidth();
|
|
}
|
|
else if(d->m_maxTextWidth.loadRelaxed() < 0)
|
|
{
|
|
+ //TODO: This appears to be broken in someway.
|
|
d->m_maxTextWidth = 0;
|
|
QTextLayout textLayout(QString(), font(), this);
|
|
for(qint32 i = 0; i < d->m_size; ++i)
|