From bdd600ba6e3a0b511cc294e3eee839bca0ba23fa Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@pioneerlibrarysystem.org>
Date: Wed, 3 Nov 2021 09:23:43 -0500
Subject: [PATCH] Spreadsheet: Display new value, or pending, when dirty

If recomputes are turned off, the old behavior was that a cell would
display its old property value in the SheetView. The new behavior is
that we check to see if the value is actually something that gets
computed: if so, show "#PENDING". If not, display the new value, but
format it specially to indicate that it's been changed and that
a recompute is (eventually) needed.
---
 src/Mod/Spreadsheet/Gui/SheetModel.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.cpp b/src/Mod/Spreadsheet/Gui/SheetModel.cpp
index 341466214f..ed12e8ad44 100644
--- a/src/Mod/Spreadsheet/Gui/SheetModel.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetModel.cpp
@@ -277,18 +277,34 @@ QVariant SheetModel::data(const QModelIndex &index, int role) const
         return QVariant::fromValue(f);
     }
 
-    if (!prop) {
+    auto dirtyCells = sheet->getCells()->getDirty();
+    auto dirty = (dirtyCells.find(CellAddress(row,col)) != dirtyCells.end());
+
+    if (!prop || dirty) {
         switch (role) {
         case  Qt::ForegroundRole: {
-            return QColor(0, 0, 255.0);
+            return QColor(0, 0, 255.0); // TODO: Remove this hardcoded color, replace with preference
         }
         case Qt::TextAlignmentRole: {
             qtAlignment = Qt::AlignHCenter | Qt::AlignVCenter;
             return QVariant::fromValue(qtAlignment);
         }
         case Qt::DisplayRole:
-            if(cell->getExpression())
-                return QVariant(QLatin1String("#PENDING"));
+            if(cell->getExpression()) {
+                std::string str;
+                if (cell->getStringContent(str))
+                    if (str.size() > 0 && str[0] == '=')
+                        // If this is a real computed value, indicate that a recompute is
+                        // needed before we can display it
+                        return QVariant(QLatin1String("#PENDING"));
+                    else
+                        // If it's just a simple value, display the new value, but still
+                        // format it as a pending value to indicate to the user that
+                        // a recompute is needed
+                        return QVariant(QString::fromUtf8(str.c_str()));
+                else
+                    return QVariant();
+            } 
             else
                 return QVariant();
         default: